diff --git a/flake.nix b/flake.nix
index 9398d12..c6e3dd5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,7 +66,9 @@
       let
         mapUserModules = lib.attrsets.mapAttrs (user: modules: {...}:
         {
-          imports = modules;
+          imports = [
+            ./home
+          ] ++ modules;
           config = {
             home = { inherit stateVersion; };
           };
@@ -96,6 +98,7 @@
       lib.nixosSystem {
         inherit system;
         modules = [
+          ./system
           ({pkgs, config, lib, ...}@args: 
             {
               # Values for every single system that would not conceivably need