diff --git a/flake.lock b/flake.lock
index f89d6c8d3..c9d5dbf60 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,6 +84,7 @@
         "nixos-images": "nixos-images",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix",
+        "systems": "systems",
         "treefmt-nix": "treefmt-nix"
       }
     },
@@ -108,6 +109,21 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 545eac1a8..c582ed3c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,12 +14,18 @@
     nixos-images.inputs.nixos-stable.follows = "";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
+    systems.url = "github:nix-systems/default";
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
-    inputs@{ flake-parts, self, ... }:
+    inputs@{
+      flake-parts,
+      self,
+      systems,
+      ...
+    }:
     flake-parts.lib.mkFlake { inherit inputs; } (
       { ... }:
       {
@@ -27,11 +33,7 @@
           meta.name = "clan-core";
           directory = self;
         };
-        systems = [
-          "x86_64-linux"
-          "aarch64-linux"
-          "aarch64-darwin"
-        ];
+        systems = import systems;
         imports = [
           ./checks/flake-module.nix
           ./clanModules/flake-module.nix