diff --git a/sam/configuration.nix b/sam/configuration.nix
index 91b184d..ab0e14d 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -4,7 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
-      (import "${builtins.fetchTarball https://github.com/nix-community/home-manager/archive/master.tar.gz}/nixos")
+      (import "${builtins.fetchTarball https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz}/nixos")
     ];
 
   # https://discourse.nixos.org/t/github-strategies-for-configuration-nix/1983/14
@@ -24,18 +24,6 @@
   # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      spice-vdagent = prev.spice-vdagent.overrideAttrs ( old: rec {
-        version = "0.22.1";
-        src = prev.fetchurl {
-          url = "https://www.spice-space.org/download/releases/spice-vdagent-${version}.tar.bz2";
-          hash = "sha256-k7DRWspHYsx9N5sXmnEBFJ267WK3IRL/+ys+kLEWh6A=";
-        };
-      });
-    })
-  ];
-
   networking.hostName = "sam"; # Define your hostname.
 
   # Enable networking
@@ -84,7 +72,7 @@
   home-manager.users.chandler = { pkgs, ... }: {
     home.packages = with pkgs; [
       # applications
-      gimp3
+      gimp
       inkscape
       kdePackages.kate
       libreoffice-qt
@@ -116,7 +104,9 @@
       jujutsu
       killall
       kubectl
-      openconnect
+      # From https://github.com/NixOS/nixpkgs/pull/370555
+      # I don't expect this to be backported, so this should be removed with 25.11
+      (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/a5ea75e611fb5bf6898d7d72401f6cb2aacf30f0.tar.gz") {}).openconnect
       pv
       ripgrep
       unzip