diff --git a/flake.lock b/flake.lock
index 4f993667..07dfb03b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,26 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1743014863,
@@ -35,8 +55,9 @@
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
-        "utils": "utils"
+        "systems": "systems"
       }
     },
     "systems": {
@@ -53,24 +74,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 465f2123..bd458167 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,14 +8,20 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+    systems.url = "github:nix-systems/default";
+
+    flake-utils = {
+      url = "github:numtide/flake-utils";
+      inputs.systems.follows = "systems";
+    };
+
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
     };
   };
 
-  outputs = { self, nixpkgs, utils, ... }@inputs:
+  outputs = { self, nixpkgs, flake-utils, ... }@inputs:
   {
     overlays.default = final: prev:
     {
@@ -145,7 +151,7 @@
       };
     };
   } //
-    utils.lib.eachSystem (utils.lib.defaultSystems ++ ["aarch64-darwin"]) (system:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
           inherit system;
diff --git a/nix/tests/default.nix b/nix/tests/default.nix
index 3ee755a2..c97c693e 100644
--- a/nix/tests/default.nix
+++ b/nix/tests/default.nix
@@ -49,13 +49,13 @@ let
 
     flakeInputs = ''
       deploy-rs.url = "${../..}";
-      deploy-rs.inputs.utils.follows = "utils";
+      deploy-rs.inputs.flake-utils.follows = "flake-utils";
+      deploy-rs.inputs.systems.follows = "systems";
       deploy-rs.inputs.flake-compat.follows = "flake-compat";
 
       nixpkgs.url = "${inputs.nixpkgs}";
-      utils.url = "${inputs.utils}";
-      utils.inputs.systems.follows = "systems";
-      systems.url = "${inputs.utils.inputs.systems}";
+      flake-utils.url = "${inputs.flake-utils}";
+      systems.url = "${inputs.flake-utils.inputs.systems}";
       flake-compat.url = "${inputs.flake-compat}";
       flake-compat.flake = false;