diff --git a/checks/flake-module.nix b/checks/flake-module.nix
index d14af606e..703fc6093 100644
--- a/checks/flake-module.nix
+++ b/checks/flake-module.nix
@@ -12,7 +12,6 @@ let
     elem
     filter
     filterAttrs
-    flip
     genAttrs
     hasPrefix
     pathExists
@@ -45,7 +44,7 @@ in
   flake.check = genAttrs [ "x86_64-linux" "aarch64-darwin" ] (
     system:
     let
-      checks = flip filterAttrs self.checks.${system} (
+      checks = filterAttrs (
         name: _check:
         !(hasPrefix "nixos-test-" name)
         && !(hasPrefix "nixos-" name)
@@ -57,7 +56,7 @@ in
           "clan-core-for-checks"
           "clan-deps"
         ])
-      );
+      ) self.checks.${system};
     in
     inputs.nixpkgs.legacyPackages.${system}.runCommand "fast-flake-checks-${system}"
       { passthru.checks = checks; }
diff --git a/docs/nix/options/flake-module.nix b/docs/nix/options/flake-module.nix
index 59f219ce0..bcedec830 100644
--- a/docs/nix/options/flake-module.nix
+++ b/docs/nix/options/flake-module.nix
@@ -13,7 +13,6 @@
     let
       inherit (lib)
         mapAttrsToList
-        flip
         mapAttrs
         mkOption
         types
@@ -43,8 +42,7 @@
 
       loadFile = file: if builtins.pathExists file then builtins.readFile file else "";
 
-      settingsModules =
-        module: flip mapAttrs (getRoles module) (_roleName: roleConfig: roleConfig.interface);
+      settingsModules = module: mapAttrs (_roleName: roleConfig: roleConfig.interface) (getRoles module);
 
       # Map each letter to its capitalized version
       capitalizeChar =
@@ -115,7 +113,7 @@
             instances.${name} = lib.mkOption {
               inherit description;
               type = types.submodule {
-                options.roles = flip mapAttrs (settingsModules module) (
+                options.roles = mapAttrs (
                   roleName: roleSettingsModule:
                   mkOption {
                     type = types.submodule {
@@ -138,7 +136,7 @@
                       ];
                     };
                   }
-                );
+                ) (settingsModules module);
               };
             };
           };
diff --git a/lib/clanTest/flake-module.nix b/lib/clanTest/flake-module.nix
index 66c2137f7..503e348ab 100644
--- a/lib/clanTest/flake-module.nix
+++ b/lib/clanTest/flake-module.nix
@@ -26,7 +26,6 @@ in
 
       inherit (lib)
         filterAttrs
-        flip
         hasPrefix
         intersectAttrs
         mapAttrs'
@@ -58,16 +57,14 @@ in
       clanFlakeResult =
         if config.clan.test.fromFlake != null then importFlake config.clan.test.fromFlake else config.clan;
 
-      machineModules' = flip filterAttrs clanFlakeResult.nixosModules (
+      machineModules' = filterAttrs (
         name: _module: hasPrefix "clan-machine-" name
-      );
+      ) clanFlakeResult.nixosModules;
 
-      machineModules = flip mapAttrs' machineModules' (
-        name: machineModule: {
-          name = removePrefix "clan-machine-" name;
-          value = machineModule;
-        }
-      );
+      machineModules = mapAttrs' (name: machineModule: {
+        name = removePrefix "clan-machine-" name;
+        value = machineModule;
+      }) machineModules';
 
       machinesCross = lib.genAttrs [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ] (
         system:
diff --git a/lib/flakes.nix b/lib/flakes.nix
index 43e87db46..79dc7bda1 100644
--- a/lib/flakes.nix
+++ b/lib/flakes.nix
@@ -23,7 +23,7 @@
         // {
           nodes =
             flakeLock.nodes
-            // (lib.flip lib.mapAttrs flakeInputs (
+            // (lib.mapAttrs (
               name: _:
               # remove follows and let 'nix flake lock' re-compute it later
               # (lib.removeAttrs flakeLock.nodes.${name} ["inputs"])
@@ -38,7 +38,7 @@
                   type = "path";
                 };
               }
-            ));
+            ) flakeInputs);
         };
       lockAttrs = inputsToPaths flakeLock;
     in
diff --git a/lib/modules/clan/module.nix b/lib/modules/clan/module.nix
index ef28ce9cf..2c5aef671 100644
--- a/lib/modules/clan/module.nix
+++ b/lib/modules/clan/module.nix
@@ -8,7 +8,6 @@
 }:
 let
   inherit (lib)
-    flip
     mapAttrs'
     ;
 
@@ -77,19 +76,15 @@ let
     config.outputs.moduleForMachine
   );
 
-  nixosModules = flip mapAttrs' nixosModules' (
-    name: machineModule: {
-      name = "clan-machine-${name}";
-      value = machineModule;
-    }
-  );
+  nixosModules = mapAttrs' (name: machineModule: {
+    name = "clan-machine-${name}";
+    value = machineModule;
+  }) nixosModules';
 
-  darwinModules = flip mapAttrs' darwinModules' (
-    name: machineModule: {
-      name = "clan-machine-${name}";
-      value = machineModule;
-    }
-  );
+  darwinModules = mapAttrs' (name: machineModule: {
+    name = "clan-machine-${name}";
+    value = machineModule;
+  }) darwinModules';
 
   nixosConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "nixos") configurations;
   darwinConfigurations = lib.filterAttrs (name: _: machineClasses.${name} == "darwin") configurations;
diff --git a/lib/modules/inventory/distributed-service/inventory-adapter.nix b/lib/modules/inventory/distributed-service/inventory-adapter.nix
index e35cc4339..15796d559 100644
--- a/lib/modules/inventory/distributed-service/inventory-adapter.nix
+++ b/lib/modules/inventory/distributed-service/inventory-adapter.nix
@@ -159,6 +159,7 @@ in
       inherit
         servicesEval
         importedModuleWithInstances
+        # Exposed for testing
         grouped
         allMachines
         importedModulesEvaluated