diff --git a/bin/cdist-config b/bin/cdist-config
index 77b98b84..e2580a00 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -160,6 +160,11 @@ __cdist_type_from_object()
    echo "${1%%/*}"
 }
 
+__cdist_object_id_from_object()
+{
+   echo "${1#*/}"
+}
+
 __cdist_object_arg()
 {
    local arg="$1"; shift
diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index 0fbc1791..038b0dc9 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -53,12 +53,12 @@ while [ "$__cdist_new_objects_created" = "y"  ]; do
       # Full path to current object
       __cdist_cur_object_dir="$__cdist_object_base_dir/$__cdist_object"
       # Only the id
-      __cdist_object_id="${__cdist_object#*/}"
+      __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
 
       if [ ! -f "${__cdist_cur_object_dir}/$__cdist_name_object_finished" ]; then
          echo "Working on object ${__cdist_object} ..."
 
-         __cdist_type="${__cdist_object%%/*}"
+         __cdist_type="$(__cdist_type_from_object "$__cdist_object")"
          __cdist_manifest="$__cdist_type_dir/${__cdist_type}/${__cdist_name_manifest}"
          echo $__cdist_manifest