diff --git a/bin/cdist-config b/bin/cdist-config
index 6d9090b0..8a4bb4a6 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -37,6 +37,8 @@ set -u
 : ${__cdist_name_init:=init}
 : ${__cdist_name_manifest:=manifest}
 : ${__cdist_name_manifest_dir:=manifests}
+: ${__cdist_name_object:=object}
+: ${__cdist_name_object_id:=object_id}
 : ${__cdist_name_out_dir:=out}
 : ${__cdist_name_conf_dir:=conf}
 : ${__cdist_name_target_host:=target_host}
@@ -46,6 +48,8 @@ set -u
 : ${__cdist_name_var_explorer:=__$__cdist_name_explorer}
 : ${__cdist_name_var_manifest:=__$__cdist_name_manifest_dir}
 : ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
+: ${__cdist_name_var_object:=__$__cdist_name_object}
+: ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
 
 # Name of the base directory containing the initial manifests
 : ${__cdist_name_manifests:=manifests}
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 553e56c0..f9217c82 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -49,11 +49,11 @@ cdist-explorer-run-init       "$__cdist_target_host" "$__cdist_out_explorer_dir"
 # Create initial object base
 cdist-manifest-run-init       "$__cdist_target_host" "$__cdist_out_object_dir"
 
-exit 2
-
 # Create dependent objects - BUG: does not abort on error in manifest!!!!
 cdist-manifest-run-all        "$__cdist_target_host" "$__cdist_out_object_dir"
 
+exit 2
+
 # Run explorer of each type for every object of types with explorer
 cdist-object-explorer-all     "$__cdist_target_host" "$__cdist_out_object_dir"
 cdist-object-codegen-all      "$__cdist_target_host" "$__cdist_out_object_dir" "$__cdist_out_execs"
diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index 5e58a205..24ebc102 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -67,8 +67,12 @@ while [ "$__cdist_new_objects_created" = "y"  ]; do
          if [ -x "${__cdist_manifest}" ]; then
             echo "Executing manifest ${__cdist_manifest} ..."
 
-            cdist-manifest-run "$__cdist_target_host" "$__cdist_cur_object_dir" \
-               "$__cdist_manifest" "$__cdist_new_objects_dir" "$__cdist_object_id"
+            # Make variables available to non-core
+            export $__cdist_name_object="$__cdist_object"
+            export $__cdist_name_object_id="$__cdist_object_id"
+
+            cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
+               "$__cdist_new_objects_dir" "$__cdist_object_id"
 
             __cdist_object_list "${__cdist_new_objects_dir}" > "$__cdist_new_objects_list"