diff --git a/users/default.nix b/users/default.nix
new file mode 100644
index 00000000..94434579
--- /dev/null
+++ b/users/default.nix
@@ -0,0 +1,9 @@
+{
+  flake = {
+    nixosModules = rec {
+      root = import ./root;
+      hensoko = import ./hensoko;
+      iot = import ./iot;
+    };
+  };
+}
diff --git a/users/hensoko/browser.nix b/users/hensoko/browser.nix
index cf67d239..da0fc711 100644
--- a/users/hensoko/browser.nix
+++ b/users/hensoko/browser.nix
@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  self,
   ...
 }:
 with lib; let
diff --git a/users/hensoko/default.nix b/users/hensoko/default.nix
index 9fe1fb3c..33eebfd0 100644
--- a/users/hensoko/default.nix
+++ b/users/hensoko/default.nix
@@ -1,4 +1,4 @@
-{ config, hmUsers, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
 in
@@ -13,8 +13,6 @@ in
   ];
 
   config = {
-    home-manager.users = { inherit (hmUsers) hensoko; };
-
     pub-solar = {
       user = {
         name = "hensoko";
diff --git a/users/hensoko/email.nix b/users/hensoko/email.nix
index 4415b986..65e8c5df 100644
--- a/users/hensoko/email.nix
+++ b/users/hensoko/email.nix
@@ -1,11 +1,18 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  flake,
+  ...
+}:
+
 with lib;
 let
   psCfg = config.pub-solar;
 in
 {
   age.secrets.email_gssws_password = {
-    file = "${self}/secrets/email_gssws_password.age";
+    file = "${flake.self}/secrets/email_gssws_password.age";
     owner = "hensoko";
   };
 
diff --git a/users/hensoko/gammastep.nix b/users/hensoko/gammastep.nix
index 4f8b3033..f5e11210 100644
--- a/users/hensoko/gammastep.nix
+++ b/users/hensoko/gammastep.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
 let
   psCfg = config.pub-solar;
diff --git a/users/hensoko/home.nix b/users/hensoko/home.nix
index c88a5a90..1184c9e8 100644
--- a/users/hensoko/home.nix
+++ b/users/hensoko/home.nix
@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  self,
   ...
 }:
 with lib; let
@@ -34,7 +33,6 @@ in {
 
     home.packages = with pkgs; [
       nix-output-monitor
-      obsidian
       btop
       dig
       fping
diff --git a/users/hensoko/htop.nix b/users/hensoko/htop.nix
index 1f9c7b28..f501a765 100644
--- a/users/hensoko/htop.nix
+++ b/users/hensoko/htop.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with pkgs lib;
 let
   psCfg = config.pub-solar;
diff --git a/users/hensoko/ssh.nix b/users/hensoko/ssh.nix
index 4ee78d6e..75cad658 100644
--- a/users/hensoko/ssh.nix
+++ b/users/hensoko/ssh.nix
@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  self,
   ...
 }:
 with lib; let
diff --git a/users/iot/default.nix b/users/iot/default.nix
index 5ba0918e..c8838707 100644
--- a/users/iot/default.nix
+++ b/users/iot/default.nix
@@ -1,4 +1,4 @@
-{ config, hmUsers, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 let
   psCfg = config.pub-solar;
 in
@@ -8,8 +8,6 @@ in
   ];
 
   config = {
-    home-manager.users = { inherit (hmUsers) iot; };
-
     pub-solar = {
       core.lite = true;
       user = {
diff --git a/users/iot/home.nix b/users/iot/home.nix
index 119380fc..c541d977 100644
--- a/users/iot/home.nix
+++ b/users/iot/home.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, self, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib;
 let
   psCfg = config.pub-solar;
diff --git a/users/pub-solar/default.nix b/users/pub-solar/default.nix
index ce4b74b6..d77c10e8 100644
--- a/users/pub-solar/default.nix
+++ b/users/pub-solar/default.nix
@@ -1,6 +1,5 @@
-{hmUsers, ...}: {
-  home-manager.users = {inherit (hmUsers) pub-solar;};
-
+{ config, ... }:
+{
   pub-solar = {
     # These are your personal settings
     # The only required settings are `name` and `password`,