diff --git a/flake-parts/sops.nix b/flake-parts/sops.nix
index 867ac34..015cd23 100644
--- a/flake-parts/sops.nix
+++ b/flake-parts/sops.nix
@@ -24,13 +24,15 @@
 
           hostCreationRules =
             self.nixosConfigurations
-            |> lib.filterAttrs (_: value: value.config.custom.sops.enable or false)
-            |> lib.mapAttrsToList (_: value: mkCreationRule value.config.custom.sops);
+            |> lib.attrValues
+            |> lib.filter (value: value.config.custom.sops.enable or false)
+            |> lib.map (value: mkCreationRule value.config.custom.sops);
 
           userCreationRules =
             self.nixosConfigurations
-            |> lib.filterAttrs (_: value: value.config.home-manager.users.seb.custom.sops.enable or false)
-            |> lib.mapAttrsToList (_: value: mkCreationRule value.config.home-manager.users.seb.custom.sops);
+            |> lib.attrValues
+            |> lib.filter (value: value.config.home-manager.users.seb.custom.sops.enable or false)
+            |> lib.map (value: mkCreationRule value.config.home-manager.users.seb.custom.sops);
 
           jsonConfig = { creation_rules = hostCreationRules ++ userCreationRules; } |> lib.strings.toJSON;
         in
diff --git a/hosts/common.nix b/hosts/common.nix
index 29c36f3..bbe02d7 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -16,7 +16,7 @@
     {
       channel.enable = false;
       registry = flakeInputs |> lib.mapAttrs (_: flake: { inherit flake; });
-      nixPath = flakeInputs |> lib.mapAttrsToList (name: _: "${name}=flake:${name}");
+      nixPath = flakeInputs |> lib.attrNames |> lib.map (name: "${name}=flake:${name}");
 
       settings = {
         flake-registry = "";
diff --git a/modules/system/meta/domains.nix b/modules/system/meta/domains.nix
index bf703c3..282e25f 100644
--- a/modules/system/meta/domains.nix
+++ b/modules/system/meta/domains.nix
@@ -17,7 +17,8 @@ in
       type = lib.types.listOf lib.types.nonEmptyStr;
       default =
         self.nixosConfigurations
-        |> lib.mapAttrsToList (_: value: value.config.meta.domains.list)
+        |> lib.attrValues
+        |> lib.map (value: value.config.meta.domains.list)
         |> lib.concatLists;
       readOnly = true;
     };
@@ -29,7 +30,8 @@ in
       let
         duplicateDomains =
           self.nixosConfigurations
-          |> lib.mapAttrsToList (_: value: value.options.meta.domains.list.definitionsWithLocations)
+          |> lib.attrValues
+          |> lib.map (value: value.options.meta.domains.list.definitionsWithLocations)
           |> lib.concatLists
           |> lib.concatMap (
             entry:
diff --git a/modules/system/services/restic-backups/default.nix b/modules/system/services/restic-backups/default.nix
index 5ec3733..e31e7fe 100644
--- a/modules/system/services/restic-backups/default.nix
+++ b/modules/system/services/restic-backups/default.nix
@@ -43,7 +43,7 @@ in
     };
 
     systemd.tmpfiles.rules =
-      resticBackups |> lib.mapAttrsToList (name: _: "d /var/cache/restic-backups-${name} 700 - - -");
+      resticBackups |> lib.attrNames |> lib.map (name: "d /var/cache/restic-backups-${name} 700 - - -");
 
     services.restic.backups =
       resticBackups