diff --git a/flake.nix b/flake.nix
index 7e2ec2a..593469b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,9 @@
 {
-  description = "haqq.nix";
-
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
   };
 
-  outputs =
-    inputs:
-    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" ];
-
-      imports = [ ./nix ];
-    };
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { imports = [ ./nix ]; };
 }
diff --git a/nix/default.nix b/nix/default.nix
index 7b73ab5..610bf3f 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,4 +1,5 @@
-_: {
+{ lib, ... }:
+{
   imports = [
     ./modules
     ./overlays.nix
@@ -6,4 +7,6 @@ _: {
     ./partitions
     ./tests
   ];
+
+  systems = lib.systems.flakeExposed;
 }
diff --git a/nix/modules/default.nix b/nix/modules/default.nix
index eb9a5c3..133d6c6 100644
--- a/nix/modules/default.nix
+++ b/nix/modules/default.nix
@@ -4,8 +4,8 @@
     default = config.flake.nixosModules.haqqd;
 
     haqqd = {
-      nixpkgs.overlays = [ inputs.self.overlays.default ];
       imports = [ ./haqqd ];
+      nixpkgs.overlays = [ inputs.self.overlays.default ];
     };
   };
 }