diff --git a/nixos/configurations/Tytonidae/specialisation/cosmic.nix b/nixos/configurations/Tytonidae/specialisation/cosmic.nix
new file mode 100644
index 0000000..7a1ff3d
--- /dev/null
+++ b/nixos/configurations/Tytonidae/specialisation/cosmic.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+{
+  config.specialisation.cosmic = {
+    inheritParentConfig = true;
+    configuration = {
+      youthlic.gui.enabled = lib.mkForce "cosmic";
+    };
+  };
+}
diff --git a/nixos/modules/gui/cosmic.nix b/nixos/modules/gui/cosmic.nix
index 041e631..2c19e20 100644
--- a/nixos/modules/gui/cosmic.nix
+++ b/nixos/modules/gui/cosmic.nix
@@ -8,18 +8,12 @@ let
 in
 {
   config = lib.mkIf (cfg.enabled == "cosmic") {
-    # Enable the X11 windowing system.
-    # You can disable this if you're only using the Wayland session.
-    services.xserver = {
-      display = 0;
-      enable = true;
-      xkb = {
-        layout = "us";
-        variant = "";
+    services = {
+      desktopManager.cosmic = {
+        enable = true;
+        xwayland.enable = true;
       };
+      displayManager.cosmic-greeter.enable = true;
     };
-
-    services.desktopManager.cosmic.enable = true;
-    services.displayManager.cosmic-greeter.enable = true;
   };
 }