diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index c512bd88..3711fac5 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -56,8 +56,8 @@ __cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}"
 
 cdist-explorer-run-global     "$__cdist_target_host"
 cdist-manifest-run-init       "$__cdist_target_host"
-cdist-object-all              "$__cdist_target_host" cdist-object-prepare
-cdist-object-all              "$__cdist_target_host" __cdist_object_run
+__cdist_object_all            cdist-object-prepare
+__cdist_object_all             __cdist_object_run
 cdist-cache                   "$__cdist_target_host"
 
 __cdist_echo info "cdist $__cdist_version: Successfully finished run"
diff --git a/bin/cdist-object-all b/bin/cdist-object-all
deleted file mode 100755
index 391c9cc7..00000000
--- a/bin/cdist-object-all
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-# 
-# Run the given command for each created object.
-#
-
-. cdist-config
-[ $# -eq 2 ] || __cdist_usage "<target host> <command>"
-set -eu
-
-__cdist_target_host="$1"; shift
-__cdist_command="$1"; shift
-
-__cdist_objects="$__cdist_tmp_dir/objects"
-
-# Ensure object dir exists, so marker can be created
-mkdir -p "${__cdist_out_object_dir}"
-
-# Loop until we do not create new objects anymore
-# which is equal to all objects have been run
-touch "$__cdist_objects_created"
-while [ -f "$__cdist_objects_created" ]; do
-   # Assume we're done after this run
-   rm "$__cdist_objects_created"
-
-   # Get listing of objects
-   __cdist_object_list "$__cdist_out_object_dir" > "$__cdist_objects"
-
-   # NEED TO CREATE ARRAY, SSH DESTROYS WHILE READ LOOP
-   while read __cdist_object; do
-      set -- "$@" "$__cdist_object"
-   done < "$__cdist_objects"
-
-   while [ $# -gt 0 ]; do
-      __cdist_object="$1"; shift
-      $__cdist_command "$__cdist_target_host" "$__cdist_object"
-   done
-done
diff --git a/core/__cdist_object_all b/core/__cdist_object_all
new file mode 100755
index 00000000..52661073
--- /dev/null
+++ b/core/__cdist_object_all
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# Run the given command for each created object.
+#
+
+__cdist_object_all()
+{
+   [ $# -eq 1 ] || __cdist_usage "<command>"
+
+   __cdist_command="$1"; shift
+
+   __cdist_objects="$__cdist_tmp_dir/objects"
+
+   # Ensure object dir exists, so marker can be created
+   mkdir -p "${__cdist_out_object_dir}"
+
+   # Loop until we do not create new objects anymore
+   # which is equal to all objects have been run
+   touch "$__cdist_objects_created"
+   while [ -f "$__cdist_objects_created" ]; do
+      # Assume we're done after this run
+      rm "$__cdist_objects_created"
+
+      # Get listing of objects
+      __cdist_object_list "$__cdist_out_object_dir" > "$__cdist_objects"
+
+      # NEED TO CREATE ARRAY, SSH DESTROYS WHILE READ LOOP
+      while read __cdist_object; do
+         set -- "$@" "$__cdist_object"
+      done < "$__cdist_objects"
+
+      while [ $# -gt 0 ]; do
+         __cdist_object="$1"; shift
+         $__cdist_command "$__cdist_object"
+      done
+   done
+}