diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix
index 1e0222c7..130cc33c 100644
--- a/deployment/data-model-test.nix
+++ b/deployment/data-model-test.nix
@@ -40,7 +40,7 @@ in
                     _class = "fediversity-resource-policy";
 
                     options = {
-                      extra-config = mkOptions {
+                      extra-config = mkOption {
                         description = "Any options from NixOS";
                       };
                       apply = mkOption {
@@ -88,12 +88,12 @@ in
                           requests:
                           let
                             # Filter out requests that need wheel if policy doesn't allow it
-                            validRequests = lib.filterAttrs (name: req: !req.wheel || config.wheel) requests;
+                            validRequests = lib.filterAttrs (_name: req: !req.wheel || config.wheel) requests;
                           in
                           lib.optionalAttrs (validRequests != { }) {
                             ${config.username} = {
                               isNormalUser = true;
-                              packages = with lib; concatMapAttrs (name: request: attrValues request.packages) validRequests;
+                              packages = with lib; concatMapAttrs (_name: request: attrValues request.packages) validRequests;
                               extraGroups = lib.optional config.wheel "wheel";
                             };
                           };
@@ -133,10 +133,10 @@ in
                           inputs.nixops4-nixos.modules.nixops4Resource.nixos
                         ];
                         nixos.module =
-                          { pkgs, ... }:
+                          { ... }:
                           {
                             users.users = config.resources.shell.login-shell.apply (
-                              lib.filterAttrs (name: value: value ? login-shell) requests
+                              lib.filterAttrs (_name: value: value ? login-shell) requests
                             );
                           };
                       };
@@ -164,8 +164,7 @@ in
       {
         inherit (fediversity) example-deployment;
       };
-    expected =
-      {
-      };
+    expected = {
+    };
   };
 }
diff --git a/deployment/data-model.nix b/deployment/data-model.nix
index 305a25d9..f0b3bf35 100644
--- a/deployment/data-model.nix
+++ b/deployment/data-model.nix
@@ -10,7 +10,6 @@ let
     attrsOf
     attrTag
     deferredModuleWith
-    submoduleWith
     submodule
     optionType
     functionTo
@@ -37,7 +36,7 @@ in
       description = "Collection of deployment resources that can be required by applications and policed by hosting providers";
       type = attrsOf (
         submodule (
-          { config, ... }:
+          { ... }:
           {
             _class = "fediversity-resource";
             options = {
@@ -56,7 +55,7 @@ in
                     {
                       _class = "fediversity-resource-policy";
                       options.apply = mkOption {
-                        desciption = "Apply the policy to a request";
+                        description = "Apply the policy to a request";
                       };
                     }
                   ];
@@ -161,13 +160,13 @@ in
       description = "Configuration type declaring options to be set by operators";
       type = optionType;
       readOnly = true;
-      default = submodule (configuration: {
+      default = submodule {
         options = {
           enable = lib.mkEnableOption {
             description = "your Fediversity configuration";
           };
           applications = lib.mapAttrs (
-            name: application:
+            _name: application:
             mkOption {
               description = application.description;
               type = submodule application.module;
@@ -175,7 +174,7 @@ in
             }
           ) config.applications;
         };
-      });
+      };
     };
   };
 }