diff --git a/nix/home/desktop.nix b/nix/home/desktop.nix
index 8d689bc..bb38238 100644
--- a/nix/home/desktop.nix
+++ b/nix/home/desktop.nix
@@ -14,7 +14,6 @@ let
   ];
 
   gnomePkgs = with pkgs; [
-    gnomecast
     gnome-tweaks
     gnomeExtensions.worksets
   ];
@@ -23,11 +22,9 @@ in
   imports = [
     (import ./commandline.nix)
     (import ./programs/alacritty)
-    # (import ./programs/kitty)
-    # (import ./programs/wezterm)
   ];
 
-  nixpkgs.overlays = [ (import ../overlays/paperwm.nix) ];
+  nixpkgs.overlays = [];
 
   home = {
     packages = defaultPkgs ++ gnomePkgs;
diff --git a/nix/overlays/paperwm.nix b/nix/overlays/paperwm.nix
deleted file mode 100644
index 47e5182..0000000
--- a/nix/overlays/paperwm.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Keep until https://github.com/paperwm/PaperWM/issues/376 is fixed
-self: super: {
-  gnomeExtensions = super.gnomeExtensions // {
-    paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: {
-      version = "pre-40.0";
-      src = builtins.fetchGit {
-        url = https://github.com/paperwm/paperwm.git;
-        ref = "next-release";
-      };
-    });
-  };
-}
diff --git a/nix/system/framework/configuration.nix b/nix/system/framework/configuration.nix
index 86b7fbb..6968e46 100644
--- a/nix/system/framework/configuration.nix
+++ b/nix/system/framework/configuration.nix
@@ -69,6 +69,7 @@
   environment.systemPackages = with pkgs; [
     cachix
     colmena
+    gnomeExtensions.paperwm
     vim
     wget
     zsh
@@ -102,6 +103,18 @@
   # List services that you want to enable:
   services.dbus.packages = with pkgs; [ dconf ];
 
+  ### Set dconf to enable PaperWM out of the box
+  programs.dconf =
+  { enable = true;
+    profiles."user".databases = [
+      { settings =
+        { "org/gnome/shell" =
+          { enabled-extensions = [ "paperwm@paperwm.github.com" ];
+          };
+        };
+      }
+    ];
+  };
 
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;