diff --git a/flake.lock b/flake.lock
index 0ff3b31..5d65143 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,7 +18,41 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 49a8382..7406204 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,46 +3,52 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
-    { self, nixpkgs }:
+    inputs:
     let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-      kernel = pkgs.linux_latest;
-      kmd = import ./pkgs/kmd { inherit pkgs kernel; };
-      sfpi = import ./pkgs/sfpi { inherit pkgs; };
-      luwen = import ./pkgs/luwen { inherit pkgs; };
-      common = import ./pkgs/common { inherit pkgs; };
-      flash = import ./pkgs/flash {
-        inherit pkgs;
-        pyluwen = luwen.pyluwen_0_1;
-      };
-      smi = import ./pkgs/smi {
-        inherit pkgs;
-        pyluwen = luwen.pyluwen;
-        tools-common = common;
-      };
-      umd = import ./pkgs/umd { inherit pkgs; };
+      inherit (inputs) self;
+      inherit (inputs.nixpkgs) lib;
     in
-    {
-      packages.${system} = {
-        kmd = kmd.kmd;
-        udev-rules = kmd.udev-rules;
-        kmd-test = kmd.test;
-        sfpi = sfpi.sfpi;
-        tt-gcc = sfpi.tt-gcc;
-        smi = smi;
-        luwen = luwen.luwen;
-        pyluwen = luwen.pyluwen;
-        tools-common = common;
-        flash = flash;
-        umd = umd;
-      };
+    inputs.utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = inputs.nixpkgs.legacyPackages.${system};
+        kernel = pkgs.linux_latest;
+        kmd = import ./pkgs/kmd { inherit pkgs kernel; };
+        sfpi = import ./pkgs/sfpi { inherit pkgs; };
+        luwen = import ./pkgs/luwen { inherit pkgs; };
+        common = import ./pkgs/common { inherit pkgs; };
+        flash = import ./pkgs/flash {
+          inherit pkgs;
+          pyluwen = luwen.pyluwen_0_1;
+        };
+        smi = import ./pkgs/smi {
+          inherit pkgs;
+          pyluwen = luwen.pyluwen;
+          tools-common = common;
+        };
+        umd = import ./pkgs/umd { inherit pkgs; };
+      in
+      {
+        packages = {
+          kmd = kmd.kmd;
+          udev-rules = kmd.udev-rules;
+          kmd-test = kmd.test;
+          sfpi = sfpi.sfpi;
+          tt-gcc = sfpi.tt-gcc;
+          smi = smi;
+          luwen = luwen.luwen;
+          pyluwen = luwen.pyluwen;
+          tools-common = common;
+          flash = flash;
+          umd = umd;
+          default = self.packages.${system}.smi;
+        };
 
-      formatter.${system} = pkgs.nixfmt-rfc-style;
-
-      defaultPackage.${system} = self.packages.${system}.smi;
-    };
+        formatter = pkgs.nixfmt-rfc-style;
+      }
+    );
 }