diff --git a/flake.nix b/flake.nix
index 053ff80..0ee8b8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   outputs = inputs: {
-    flakeModule = ./flake-module.nix;
+    flakeModule = ./nix/flake-module.nix;
 
     templates =
       let
diff --git a/flake-module.nix b/nix/flake-module.nix
similarity index 95%
rename from flake-module.nix
rename to nix/flake-module.nix
index fe8994c..ca29795 100644
--- a/flake-module.nix
+++ b/nix/flake-module.nix
@@ -48,7 +48,7 @@ in
               };
 
             # New-style activate app that can also activately remotely over SSH.
-            activate = import ./activate { inherit self inputs' pkgs lib system; };
+            activate = import ../activate { inherit self inputs' pkgs lib system; };
 
             activate-home =
               if hasNonEmptyAttr [ "homeConfigurations" ] self || hasNonEmptyAttr [ "legacyPackages" system "homeConfigurations" ] self
@@ -72,7 +72,7 @@ in
 
   config = {
     flake = {
-      nixosModules.nixosFlake = ./nix/nixos-module.nix;
+      nixosModules.nixosFlake = ./nixos-module.nix;
       # Linux home-manager module
       nixosModules.home-manager = {
         imports = [
@@ -85,7 +85,7 @@ in
         ];
       };
 
-      darwinModules_.nixosFlake = ./nix/nixos-module.nix;
+      darwinModules_.nixosFlake = ./nixos-module.nix;
       # macOS home-manager module
       # This is named with an underscope, because flake-parts segfaults otherwise!
       # See https://github.com/srid/nixos-config/issues/31