diff --git a/deployment/data-model.nix b/deployment/data-model.nix
index f0b3bf35..4ad63bb1 100644
--- a/deployment/data-model.nix
+++ b/deployment/data-model.nix
@@ -20,11 +20,7 @@ let
     options.resources = mkOption {
       # TODO: maybe transpose, and group the resources by type instead
       type = attrsOf (
-        attrTag (
-          lib.mapAttrs' (name: resource: {
-            ${name} = mkOption { type = resource.request; };
-          }) config.resources
-        )
+        attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources)
       );
     };
   };
@@ -118,9 +114,7 @@ in
               # TODO: maybe transpose, and group the resources by type instead
               type = attrsOf (
                 attrTag (
-                  lib.mapAttrs' (name: resource: {
-                    ${name} = mkOption { type = resource.policy; };
-                  }) config.resources
+                  lib.mapAttrs (_name: resource: mkOption { type = submodule resource.policy; }) config.resources
                 )
               );
             };