diff --git a/bin/cdist-object-explorer-run b/bin/cdist-object-explorer-run
index ac39755b..ed001e83 100755
--- a/bin/cdist-object-explorer-run
+++ b/bin/cdist-object-explorer-run
@@ -29,8 +29,8 @@ set -eu
 __cdist_target_host="$1"; shift
 __cdist_object_self="$1"; shift
 
-__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
-__cdist_type="$(__cdist_type_from_object "$__cdist_object")"
+__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
+__cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
 
 # Check if type of object has >= 1 explorer
 __cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"
@@ -47,8 +47,8 @@ if [ "$__cdist_has_explorer" ]; then
    __cdist_echo info "Running explorers ..."
    # Copy object parameters
    cdist-dir push "$__cdist_target_host"                          \
-      "$(__cdist_object_parameter_dir "$__cdist_object")"         \
-      "$(__cdist_remote_object_parameter_dir "$__cdist_object")"
+      "$(__cdist_object_parameter_dir "$__cdist_object_self")"         \
+      "$(__cdist_remote_object_parameter_dir "$__cdist_object_self")"
 
    # Execute explorers
    cdist-run-remote "$__cdist_target_host"                     \
@@ -58,10 +58,10 @@ if [ "$__cdist_has_explorer" ]; then
       cdist-remote-explorer-run                                \
       "$__cdist_name_var_type_explorer"                        \
       "$(__cdist_remote_type_explorer_dir "$__cdist_type")"    \
-      "$(__cdist_remote_object_type_explorer_dir "$__cdist_object")"
+      "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")"
 
    # Copy back results
    cdist-dir pull "$__cdist_target_host"                             \
-      "$(__cdist_remote_object_type_explorer_dir "$__cdist_object")" \
-      "$(__cdist_object_type_explorer_dir "$__cdist_object")"
+      "$(__cdist_remote_object_type_explorer_dir "$__cdist_object_self")" \
+      "$(__cdist_object_type_explorer_dir "$__cdist_object_self")"
 fi