diff --git a/bin/cdist_tree_wrapper b/bin/cdist_tree_wrapper
index ac595888..bcd36837 100755
--- a/bin/cdist_tree_wrapper
+++ b/bin/cdist_tree_wrapper
@@ -32,11 +32,11 @@ set -eu
 
 echo "I am $__cdist_myname and have been called with $@"
 
-__cdist_id="$1"; shift
+export __cdist_object_id="$1"; shift
 
-echo "$__cdist_id" | grep -q "^${__cdist_sane_regexp}\$" || __cdist_usage "Provide sane id, please"
+echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || __cdist_usage "Provide sane id, please"
 
-__cdist_tid="${__cdist_myname}/${__cdist_id}"
+__cdist_tid="${__cdist_myname}/${__cdist_object_id}"
 __cdist_ddir="$(__cdist_cache_host)/${__cdist_name_object}/${__cdist_tid}"
 
 if [ -e "${__cdist_ddir}" ]; then