diff --git a/bin/cdist-type-emulator b/bin/cdist-type-emulator
index a4f66e5b..f8e1d2c2 100755
--- a/bin/cdist-type-emulator
+++ b/bin/cdist-type-emulator
@@ -41,8 +41,8 @@ echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
    __cdist_usage "Insane object id, ${__cdist_object_id}."
 
 __cdist_object="${__cdist_type}/${__cdist_object_id}"
-__cdist_ddir="$__cdist_output_dir/${__cdist_object}"
-__cdist_parameter_dir="$__cdist_ddir/$__cdist_name_parameter"
+__cdist_ddir="$(__cdist_object_dir "$__cdist_object")"
+__cdist_parameter_dir="$(__cdist_object_parameter_dir "$__cdist_object")"
 
 # Append id for error messages
 __cdist_myname="$__cdist_myname ($__cdist_object_id)"