diff --git a/hosts/manwe/users/chris/test.nix b/hosts/manwe/users/chris/test.nix
index 0fe32ba..3dc0c6f 100644
--- a/hosts/manwe/users/chris/test.nix
+++ b/hosts/manwe/users/chris/test.nix
@@ -1,4 +1,4 @@
 { ... }:
 {
-  kaas = true;
+  kaas = false;
 }
diff --git a/hosts/orome/users/chris/test.nix b/hosts/orome/users/chris/test.nix
new file mode 100644
index 0000000..0fe32ba
--- /dev/null
+++ b/hosts/orome/users/chris/test.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  kaas = true;
+}
diff --git a/hosts/orome/users/kaas/test.nix b/hosts/orome/users/kaas/test.nix
new file mode 100644
index 0000000..0fe32ba
--- /dev/null
+++ b/hosts/orome/users/kaas/test.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  kaas = true;
+}
diff --git a/lib/nixos.nix b/lib/nixos.nix
index 6c7688f..6cf5850 100644
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@@ -60,17 +60,17 @@ in rec
         (filterAttrs (n: v: !elem n ["system"]) attrs)
         ../. # ../default.nix
         (import path)
-      ]
-      ++ (map (user: {
-        _module.args.user = user;
+      ];
+      # ++ (map (user: {
+      #   _module.args.user = user;
 
-        imports = [
-          "${path}/users/${user}/test.nix"
-        ]
-        ++ (mapModulesRec' ../modules/home (file: file));
+      #   imports = [
+      #     "${path}/users/${user}/test.nix"
+      #   ]
+      #   ++ (mapModulesRec' ../modules/home (file: file));
 
-        modules.${user} = (import "${path}/users/${user}/default.nix" args);
-      }) users);
+      #   modules.${user} = (import "${path}/users/${user}/default.nix" args);
+      # }) users);
     };
 
   mapHosts = dir: attrs @ {system ? system, ...}:
diff --git a/lib/user.nix b/lib/user.nix
index 81d77c8..7aaa2b4 100644
--- a/lib/user.nix
+++ b/lib/user.nix
@@ -2,6 +2,7 @@
   inherit (builtins) baseNameOf;
   inherit (lib.attrsets) filterAttrs;
   inherit (lib.strings) removeSuffix;
+  inherit (lib.my) mapModulesRec';
 in rec
 {
   mkSysUser = path: let
@@ -26,6 +27,7 @@ in rec
     name = removeSuffix ".nix" (baseNameOf path);
   in
     {
+      imports = (mapModulesRec' ../modules/home (file: file));
       home = {
         inherit stateVersion;
         sessionPath = [ "$SNEEUWVLOK_BIN" "$XDG_BIN_HOME" "$PATH" ]; # Pretty sure I don't need this.
diff --git a/modules/home/options.nix b/modules/home/options.nix
index 41a7702..85515d3 100644
--- a/modules/home/options.nix
+++ b/modules/home/options.nix
@@ -6,7 +6,7 @@
   {
     kaas = mkOption {
       type = lib.types.bool;
-      default = false;
+      default = true;
       example = true;
       description = "";
     };