diff --git a/common/fragments/graphical/dunst.nix b/common/fragments/graphical/dunst.nix
index c1f1534..e84ab93 100644
--- a/common/fragments/graphical/dunst.nix
+++ b/common/fragments/graphical/dunst.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }:
+{ pkgs, config, ... }:
 let
   color = n:
     config.environment.graphical.colors."${config.environment.graphical.theme.name}"."${builtins.toString
@@ -95,6 +95,7 @@ in {
           foreground = color 15;
           frame_color = color 3;
 
+          fullscreen = "show";
           timeout = 0;
         };
         # Horrible hack to fix alphabetical sorting overriding this
diff --git a/common/fragments/graphical/lockscreen.nix b/common/fragments/graphical/lockscreen.nix
index 8b76544..fa2b3f5 100644
--- a/common/fragments/graphical/lockscreen.nix
+++ b/common/fragments/graphical/lockscreen.nix
@@ -3,6 +3,7 @@
     # Lockscreen
     services.betterlockscreen = {
       enable = true;
+      package = pkgs.unstable.betterlockscreen;
       arguments = [ "dimblur" ];
     };
 
@@ -17,14 +18,7 @@
     # Send a notification 10 seconds before locking
     services.screen-locker.xautolock.extraOptions = [
       "-notify 10"
-      "-notifier '${pkgs.xscreensaver}/bin/xscreensaver-command --activate'"
+      "-notifier '${pkgs.dunst}/bin/dunstify -t 10000 -u 2 \"Screen will lock in 10 seconds\"'"
     ];
-    services.xscreensaver = {
-      enable = true;
-      settings = {
-        dpmsEnabled = "False";
-        mode = "off";
-      };
-    };
   };
 }
diff --git a/flake.nix b/flake.nix
index 4e3430e..c9a65d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,7 +95,7 @@
         network = {
           description = "Agatha's Nix Infra";
 
-          nixpkgs = import nixpkgs {
+          nixpkgs = import nixpkgs rec {
             system = "x86_64-linux";
             overlays = [
               (final: prev: {
@@ -114,6 +114,9 @@
                 spicetify-pkgs = spicetify-nix.packages.${final.system}.default;
                 matrix-ril100 = matrix-ril100.packages.${final.system}.default;
                 ccase = ccase.packages.${final.system}.default;
+
+                # Unstable packages
+                unstable = import nixpkgs-unstable { inherit system; };
               })
               colmena.overlay
             ];