diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix
index 2bb5de55..cfce5db0 100644
--- a/deployment/data-model-test.nix
+++ b/deployment/data-model-test.nix
@@ -151,7 +151,7 @@ in
           }
         );
         resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
-        hello-shell = (resources).resources.hello.login-shell;
+        hello-shell = resources.resources.hello.login-shell;
         environment = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell;
         result = mkDeployment {
           modules = [
@@ -160,7 +160,7 @@ in
         };
 
       in
-      rec {
+      {
         number-of-resources = with lib; length (attrNames fediversity.resources);
         inherit (fediversity) example-configuration;
         hello-package-exists = hello-shell.packages ? hello;
@@ -172,7 +172,7 @@ in
           in
           {
             inherit (operator) isNormalUser;
-            packages = with lib; map (p: "${p.pname}") operator.packages;
+            packages = map (p: "${p.pname}") operator.packages;
             extraGroups = operator.extraGroups;
           };
         deployment = {
diff --git a/deployment/data-model.nix b/deployment/data-model.nix
index f005084b..abe37e5e 100644
--- a/deployment/data-model.nix
+++ b/deployment/data-model.nix
@@ -73,7 +73,7 @@ in
                       # and then also rename this to be consistent with the application's resource mapping
                       options.apply = mkOption {
                         description = "Apply the policy to a request";
-                        type = with types; functionTo policy.config.resource-type;
+                        type = functionTo policy.config.resource-type;
                       };
                     })
                   ];