diff --git a/flake.nix b/flake.nix
index ee8243c..67ade3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,6 +57,8 @@
           otherHosts = lib.mapAttrsToList (n: v: {
             inherit (self.nixosConfigurations.${n}) config;
           }) otherHostNames;
+          homeCfg = ./hosts/${host}/home;
+          systemCfg = ./hosts/${host}/os;
         in
         {
           specialArgs = { inherit inputs otherHosts; };
@@ -70,7 +72,7 @@
             inputs.sops-nix.nixosModules.default
             ./common
             ./nixosModules
-            (inputs.import-tree ./hosts/${host}/os)
+            (inputs.import-tree systemCfg)
             {
               home-manager.sharedModules = [
                 ./homeModules
@@ -111,7 +113,7 @@
                     }
                   ];
                   users.${config.sidonia.userName} = {
-                    imports = [ (inputs.import-tree ./hosts/${host}/home) ];
+                    imports = lib.optional (lib.pathExists homeCfg) (inputs.import-tree homeCfg);
                     home = {
                       username = config.sidonia.userName;
                       homeDirectory = "/home/${config.sidonia.userName}";