diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/misc.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/misc.nix
index 737c0b2d..ff134fca 100644
--- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/misc.nix
+++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/misc.nix
@@ -2,7 +2,7 @@
 
 let userConfig = hmConfig.users.foo-dogsquared;
 in {
-  extraPlugins = builtins.map (path:
+  extraPlugins = lib.map (path:
     pkgs.runCommand "vim-plugin-bare" { } ''
       mkdir -p "$out"
       cp -r ${path}/* "$out"
diff --git a/configs/home-manager/foo-dogsquared/modules/setups/research.nix b/configs/home-manager/foo-dogsquared/modules/setups/research.nix
index c4e7470f..c8398c51 100644
--- a/configs/home-manager/foo-dogsquared/modules/setups/research.nix
+++ b/configs/home-manager/foo-dogsquared/modules/setups/research.nix
@@ -27,13 +27,13 @@ let
           inherit name;
           inherit (value) subscriptions extraArgs;
         }) db);
-      jobsList = builtins.map (category:
+      jobsList = lib.map (category:
         let jobExtraArgs = lib.attrByPath [ "data" "extraArgs" ] [ ] category;
         in {
           name = category.data.name;
           value = {
             extraArgs = extraArgs ++ jobExtraArgs;
-            urls = builtins.map (subscription: subscription.url)
+            urls = lib.map (subscription: subscription.url)
               category.data.subscriptions;
             startAt =
               lib.elemAt days (lib.mod category.index (lib.length days));
diff --git a/configs/nixos/ni/modules/networking/wireguard.nix b/configs/nixos/ni/modules/networking/wireguard.nix
index 2d82e609..ac25d89f 100644
--- a/configs/nixos/ni/modules/networking/wireguard.nix
+++ b/configs/nixos/ni/modules/networking/wireguard.nix
@@ -103,7 +103,7 @@ in {
         };
         applySystemdAttr = secretPaths:
           lib.listToAttrs
-          (builtins.map (path: lib.nameValuePair path systemdNetworkFileAttrs))
+          (lib.map (path: lib.nameValuePair path systemdNetworkFileAttrs))
           secretPaths;
       in applySystemdAttr [
         "wireguard/private-key"
diff --git a/configs/nixos/ni/modules/services/backup/default.nix b/configs/nixos/ni/modules/services/backup/default.nix
index 97b29f51..924d7399 100644
--- a/configs/nixos/ni/modules/services/backup/default.nix
+++ b/configs/nixos/ni/modules/services/backup/default.nix
@@ -16,7 +16,7 @@ let
         mode = "repokey-blake2";
       };
       extraCreateArgs = lib.concatStringsSep " "
-        (builtins.map (patternFile: "--patterns-from ${patternFile}") patterns);
+        (lib.map (patternFile: "--patterns-from ${patternFile}") patterns);
       extraInitArgs = "--make-parent-dirs";
 
       # We're emptying them since we're specifying them all through the patterns file.
diff --git a/configs/nixos/ni/modules/services/download-media/default.nix b/configs/nixos/ni/modules/services/download-media/default.nix
index 6398fa41..cdb06d9f 100644
--- a/configs/nixos/ni/modules/services/download-media/default.nix
+++ b/configs/nixos/ni/modules/services/download-media/default.nix
@@ -92,13 +92,13 @@ in {
             inherit name;
             inherit (value) subscriptions extraArgs;
           }) db);
-        jobsList = builtins.map (category:
+        jobsList = lib.map (category:
           let jobExtraArgs = lib.attrByPath [ "data" "extraArgs" ] [ ] category;
           in {
             name = category.data.name;
             value = {
               extraArgs = extraArgs ++ jobExtraArgs;
-              urls = builtins.map (subscription: subscription.url)
+              urls = lib.map (subscription: subscription.url)
                 category.data.subscriptions;
               startAt =
                 lib.elemAt days (lib.mod category.index (lib.length days));
diff --git a/configs/nixos/plover/modules/services/backup.nix b/configs/nixos/plover/modules/services/backup.nix
index d30d77f1..608d6fc9 100644
--- a/configs/nixos/plover/modules/services/backup.nix
+++ b/configs/nixos/plover/modules/services/backup.nix
@@ -22,10 +22,10 @@ let
       };
       extraCreateArgs = let
         args = lib.flatten [
-          (builtins.map
+          (lib.map
             (patternFile: "--patterns-from ${lib.escapeShellArg patternFile}")
             patternFiles)
-          (builtins.map (pattern: "--pattern ${lib.escapeShellArg pattern}")
+          (lib.map (pattern: "--pattern ${lib.escapeShellArg pattern}")
             patterns)
         ];
       in lib.concatStringsSep " " args;
diff --git a/configs/nixvim/fiesta/modules/setups/treesitter.nix b/configs/nixvim/fiesta/modules/setups/treesitter.nix
index f98ead59..0aab8a18 100644
--- a/configs/nixvim/fiesta/modules/setups/treesitter.nix
+++ b/configs/nixvim/fiesta/modules/setups/treesitter.nix
@@ -88,7 +88,7 @@ in {
           # A set of bindings to be used for each jump direction.
           bindings:
           let
-            mappings = builtins.map (motion:
+            mappings = lib.map (motion:
               let
                 inherit (motion) region jumpDirection variant;
                 jumpDirection' = lib.strings.toLower jumpDirection;
@@ -164,7 +164,7 @@ in {
             binding:
 
             let
-              mappingsList = builtins.map (variant:
+              mappingsList = lib.map (variant:
                 let prefixMap' = prefixMap.${variant};
                 in lib.nameValuePair "${prefixMap'.key}${binding}" {
                   query = "@${query}.${variant}";
@@ -200,7 +200,7 @@ in {
 
         mkQueryMappings = acc: query: bindings:
           let
-            mappings = builtins.map (motion:
+            mappings = lib.map (motion:
               let
                 inherit (motion) jumpDirection variant;
                 jumpDirection' = lib.strings.toLower jumpDirection;
diff --git a/configs/nixvim/trovebelt/modules/setups/lsp.nix b/configs/nixvim/trovebelt/modules/setups/lsp.nix
index 20a2b540..c900d4ad 100644
--- a/configs/nixvim/trovebelt/modules/setups/lsp.nix
+++ b/configs/nixvim/trovebelt/modules/setups/lsp.nix
@@ -65,7 +65,7 @@ in {
 
         mkEnableServerConfig = server:
           lib.nameValuePair server { enable = true; };
-      in lib.listToAttrs (builtins.map mkEnableServerConfig servers);
+      in lib.listToAttrs (lib.map mkEnableServerConfig servers);
     }
 
     {
diff --git a/configs/wrapper-manager/dotfiles-wrapped/npins/default.nix b/configs/wrapper-manager/dotfiles-wrapped/npins/default.nix
index b774a4b0..820650d0 100644
--- a/configs/wrapper-manager/dotfiles-wrapped/npins/default.nix
+++ b/configs/wrapper-manager/dotfiles-wrapped/npins/default.nix
@@ -63,7 +63,7 @@ let
       sha256 = hash;
     };
 in if version == 3 then
-  builtins.mapAttrs (_: mkSource) data.pins
+  lib.mapAttrs (_: mkSource) data.pins
 else
   throw "Unsupported format version ${
     toString version
diff --git a/modules/flake-parts/setups/disko.nix b/modules/flake-parts/setups/disko.nix
index 209970b2..979ea4d0 100644
--- a/modules/flake-parts/setups/disko.nix
+++ b/modules/flake-parts/setups/disko.nix
@@ -53,7 +53,7 @@ in {
 
       config = lib.mkIf (config.diskoConfigs != [ ]) (let
         diskoConfigs =
-          builtins.map (name: "${partsConfig.setups.configDir}/disko/${name}")
+          lib.map (name: "${partsConfig.setups.configDir}/disko/${name}")
           config.diskoConfigs;
       in {
         modules = lib.singleton {
diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix
index 789a1a4a..21cf0294 100644
--- a/modules/flake-parts/setups/home-manager.nix
+++ b/modules/flake-parts/setups/home-manager.nix
@@ -363,7 +363,7 @@ in {
         # A quick data structure we can pass through multiple build pipelines.
         pureHomeManagerConfigs = let
           generatePureConfigs = username: metadata:
-            lib.listToAttrs (builtins.map (system:
+            lib.listToAttrs (lib.map (system:
               let
                 nixpkgs = inputs.${metadata.nixpkgs.branch};
 
diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix
index e7294317..361424e7 100644
--- a/modules/flake-parts/setups/nixos.nix
+++ b/modules/flake-parts/setups/nixos.nix
@@ -283,7 +283,7 @@ in {
             cfg.configs;
 
           generatePureConfigs = hostname: metadata:
-            lib.listToAttrs (builtins.map (system:
+            lib.listToAttrs (lib.map (system:
               let
                 nixpkgs = inputs.${metadata.nixpkgs.branch};
 
@@ -344,7 +344,7 @@ in {
                   extraModules = cfg.sharedModules ++ metadata.modules;
                 });
 
-              images = builtins.map buildImage metadata.formats;
+              images = lib.map buildImage metadata.formats;
             in lib.listToAttrs images;
         in lib.concatMapAttrs generateImages validImages;
       };
diff --git a/modules/flake-parts/setups/nixvim.nix b/modules/flake-parts/setups/nixvim.nix
index e56f059f..ceb5348b 100644
--- a/modules/flake-parts/setups/nixvim.nix
+++ b/modules/flake-parts/setups/nixvim.nix
@@ -254,7 +254,7 @@ in {
                     modules = cfg.sharedModules ++ cfg.standaloneConfigModules
                       ++ metadata.modules ++ [{ package = neovimPackage; }];
                   });
-                nixvimConfigs = builtins.map mkNixvimConfig' metadata.components;
+                nixvimConfigs = lib.map mkNixvimConfig' metadata.components;
               in lib.listToAttrs nixvimConfigs;
           in lib.concatMapAttrs generateNixvimConfigs validConfigs;
         in {
diff --git a/modules/home-manager/programs/pop-launcher.nix b/modules/home-manager/programs/pop-launcher.nix
index 4a53c14f..ec2e09a1 100644
--- a/modules/home-manager/programs/pop-launcher.nix
+++ b/modules/home-manager/programs/pop-launcher.nix
@@ -7,7 +7,7 @@ let
   # `$out/share/pop-launcher`.
   pluginsDir = pkgs.symlinkJoin {
     name = "pop-launcher-plugins-system";
-    paths = builtins.map (p: "${p}/share/pop-launcher") cfg.plugins;
+    paths = lib.map (p: "${p}/share/pop-launcher") cfg.plugins;
   };
 in {
   options.programs.pop-launcher = {
diff --git a/modules/nixos/_private/workflows/a-happy-gnome/default.nix b/modules/nixos/_private/workflows/a-happy-gnome/default.nix
index dc44380b..1fba034d 100644
--- a/modules/nixos/_private/workflows/a-happy-gnome/default.nix
+++ b/modules/nixos/_private/workflows/a-happy-gnome/default.nix
@@ -131,7 +131,7 @@ in {
         "app.drey.Dialect"
         "com.belmoussaoui.Authenticator"
       ];
-      apply = builtins.map (x: "${x}.desktop");
+      apply = lib.map (x: "${x}.desktop");
     };
 
     disableNotifications = lib.mkOption {
@@ -222,14 +222,14 @@ in {
             };
             "org/gnome/shell" = {
               enabled-extensions =
-                builtins.map (p: p.extensionUuid) shellExtensions';
+                lib.map (p: p.extensionUuid) shellExtensions';
             };
           }
 
           # Disable all of the messenger's notification (only the annoying
           # ones).
           (lib.pipe cfg.disableNotifications [
-            (builtins.map (app:
+            (lib.map (app:
               lib.nameValuePair
               "org/gnome/desktop/notifications/application/${app}" {
                 show-banners = false;
diff --git a/modules/nixos/programs/gnome-session/default.nix b/modules/nixos/programs/gnome-session/default.nix
index abf671bf..69a89566 100644
--- a/modules/nixos/programs/gnome-session/default.nix
+++ b/modules/nixos/programs/gnome-session/default.nix
@@ -158,7 +158,7 @@ in {
             requiredComponents =
               let
                 gsdComponents =
-                  builtins.map
+                  lib.map
                     (gsdc: "org.gnome.SettingsDaemon.''${gsdc}")
                     [
                       "A11ySettings"
@@ -175,7 +175,7 @@ in {
 
             systemd.targetUnit = {
               requires = [ "org.gnome.Shell.target" ];
-              wants = builtins.map (c: "''${c}.target") (lib.lists.remove "org.gnome.Shell" sessionCfg.requiredComponents);
+              wants = lib.map (c: "''${c}.target") (lib.lists.remove "org.gnome.Shell" sessionCfg.requiredComponents);
             };
           };
 
diff --git a/modules/nixos/programs/gnome-session/submodules/session-type.nix b/modules/nixos/programs/gnome-session/submodules/session-type.nix
index 401875df..8fffcff6 100644
--- a/modules/nixos/programs/gnome-session/submodules/session-type.nix
+++ b/modules/nixos/programs/gnome-session/submodules/session-type.nix
@@ -67,7 +67,7 @@ in {
       default = [ config.fullName ];
       defaultText = "[ <session>.fullName ]";
       apply = names:
-        builtins.map (name:
+        lib.map (name:
           if (lib.elem name validDesktopNames) || (lib.hasPrefix "X-" name) then
             name
           else
@@ -222,7 +222,7 @@ in {
     systemd.targetUnit = {
       overrideStrategy = lib.mkForce "asDropin";
       wants = lib.mkDefault
-        (builtins.map (c: "${c}.target") config.requiredComponents);
+        (lib.map (c: "${c}.target") config.requiredComponents);
     };
 
     settings."GNOME Session" = {
diff --git a/modules/nixos/programs/pop-launcher.nix b/modules/nixos/programs/pop-launcher.nix
index 632801cf..40d4810a 100644
--- a/modules/nixos/programs/pop-launcher.nix
+++ b/modules/nixos/programs/pop-launcher.nix
@@ -7,7 +7,7 @@ let
   # `$out/share/pop-launcher`.
   pluginsDir = pkgs.symlinkJoin {
     name = "pop-launcher-plugins-system";
-    paths = builtins.map (p: "${p}/share/pop-launcher") cfg.plugins;
+    paths = lib.map (p: "${p}/share/pop-launcher") cfg.plugins;
   };
 in {
   options.programs.pop-launcher = {
diff --git a/modules/nixos/programs/sessiond/submodules/session-type.nix b/modules/nixos/programs/sessiond/submodules/session-type.nix
index d77f765a..df2f1223 100644
--- a/modules/nixos/programs/sessiond/submodules/session-type.nix
+++ b/modules/nixos/programs/sessiond/submodules/session-type.nix
@@ -70,7 +70,7 @@ in {
       default = [ config.fullName ];
       defaultText = "[ <session>.fullName ]";
       apply = names:
-        builtins.map (name:
+        lib.map (name:
           if (lib.elem name validDesktopNames) || (lib.hasPrefix "X-" name) then
             name
           else
diff --git a/modules/wrapper-manager/wraparound/bubblewrap/dbus-filter.nix b/modules/wrapper-manager/wraparound/bubblewrap/dbus-filter.nix
index 244a3e58..e49e2927 100644
--- a/modules/wrapper-manager/wraparound/bubblewrap/dbus-filter.nix
+++ b/modules/wrapper-manager/wraparound/bubblewrap/dbus-filter.nix
@@ -110,8 +110,8 @@ in {
       config.extraArgs = let inherit (config) policies;
       in lib.optionals (policies.level != null)
       [ "--${policies.level}=${name}" ]
-      ++ builtins.map (rule: "--call=${name}=${rule}") policies.call
-      ++ builtins.map (rule: "--broadcast=${name}=${rule}") policies.broadcast;
+      ++ lib.map (rule: "--call=${name}=${rule}") policies.call
+      ++ lib.map (rule: "--broadcast=${name}=${rule}") policies.broadcast;
     };
 
     bubblewrapModule = { config, lib, pkgs, name, ... }:
diff --git a/modules/wrapper-manager/wraparound/bubblewrap/filesystem.nix b/modules/wrapper-manager/wraparound/bubblewrap/filesystem.nix
index 4a836f41..a3a6b9cd 100644
--- a/modules/wrapper-manager/wraparound/bubblewrap/filesystem.nix
+++ b/modules/wrapper-manager/wraparound/bubblewrap/filesystem.nix
@@ -235,13 +235,13 @@ in {
             (lib.mkIf (submoduleCfg.sharedNixPaths != [ ]) {
               wraparound.bubblewrap.extraArgs =
                 let closurePaths = getClosurePaths submoduleCfg.sharedNixPaths;
-                in builtins.map (p: "--ro-bind ${p} ${p}") closurePaths;
+                in lib.map (p: "--ro-bind ${p} ${p}") closurePaths;
             })
 
             (lib.mkIf submoduleCfg.dbus.enable {
               wraparound.bubblewrap.dbus.filter.bwrapArgs =
                 let closurePaths = getClosurePaths submoduleCfg.sharedNixPaths;
-                in builtins.map (p: "--ro-bind ${p} ${p}") closurePaths;
+                in lib.map (p: "--ro-bind ${p} ${p}") closurePaths;
             })
           ]);
       };