diff --git a/modules/global/home-manager.nix b/modules/global/home-manager.nix
index e82f120..dca1692 100644
--- a/modules/global/home-manager.nix
+++ b/modules/global/home-manager.nix
@@ -28,9 +28,6 @@
             createDirectories = true;
           };
         };
-      (lib.mkIf config.services.xserver.enable {
-        xsession.enable = true;
-      })
       }
       (lib.mkIf config.info.graphical {
         xdg.systemDirs.data = [
diff --git a/modules/modules/desktop/wm.nix b/modules/modules/desktop/wm.nix
index 943eff4..783dbed 100644
--- a/modules/modules/desktop/wm.nix
+++ b/modules/modules/desktop/wm.nix
@@ -22,6 +22,10 @@ in
         displayManager.lightdm.enable = true;
       };
 
+      home-manager.sharedModules = [{
+        xsession.enable = true;
+      }];
+
       environment.systemPackages = with pkgs; flatten [
         (with xorg; [
           xwininfo