diff --git a/nix/devShells/masna3.nix b/nix/devShells/masna3.nix
index 83c8c749..89da2ccb 100644
--- a/nix/devShells/masna3.nix
+++ b/nix/devShells/masna3.nix
@@ -1,69 +1,53 @@
 let
-  bootpkgs = import <nixpkgs> {};
-
-  pkgs = import (bootpkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "nixos-25.05";
-    hash = "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=";
-  }) {};
-
-  unstable = import (bootpkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "haskell-updates";
-    hash = "sha256-dwgA4RwZhqiz4VZoCBf9Li8hWIppGEhcIRL/PIBsStU=";
-  }) {};
+  sources = import ../../npins;
 in
-  pkgs.mkShell (let
-    libs = with pkgs; [
-      zlib
-      libpq
-      libsodium
-    ];
+  {pkgs ? import sources.pin-masna3shell {}}:
+    pkgs.mkShell (let
+      libs = with pkgs; [
+        zlib
+        libpq
+        libsodium
+      ];
 
-    hlib = pkgs.haskell.lib;
+      hlib = pkgs.haskell.lib;
 
-    callHackage = {
-      name,
-      version,
-      haskellPackages ? pkgs.haskellPackages,
-    }: let
-      pkg = haskellPackages.callHackage name version {};
-    in
-      hlib.dontCheck (hlib.doJailbreak pkg);
+      callHackage = {
+        name,
+        version,
+        haskellPackages ? pkgs.haskellPackages,
+      }: let
+        pkg = haskellPackages.callHackage name version {};
+      in
+        hlib.dontCheck (hlib.doJailbreak pkg);
 
-    haskellPackages = pkgs.haskellPackages;
-  in {
-    name = "masna3";
-    packages =
-      [
-        # used pinned ghc
-        unstable.haskell.packages.ghc9102.ghc
+      haskellPackages = pkgs.haskell.packages.ghc910;
+    in {
+      name = "masna3";
+      packages =
+        [
+          pkgs.haskell.packages.ghc9102.ghc
+          pkgs.haskell.packages.ghc9102.haskell-language-server
 
-        # Broken :(
-        # unstableHaskellPackages.haskell-language-server
+          haskellPackages.cabal-install
+          haskellPackages.postgresql-migration
+          (callHackage {
+            name = "fourmolu";
+            version = "0.18.0.0";
+            haskellPackages = pkgs.haskell.packages.ghc912;
+          })
+          (callHackage {
+            name = "hlint";
+            version = "3.10";
+            haskellPackages = pkgs.haskell.packages.ghc912;
+          })
+          pkgs.haskell.packages.ghc98.apply-refact
+          haskellPackages.ghc-tags
+          haskellPackages.cabal-gild
 
-        haskellPackages.cabal-install
-        haskellPackages.postgresql-migration
-        (callHackage {
-          name = "fourmolu";
-          version = "0.18.0.0";
-          haskellPackages = pkgs.haskell.packages.ghc912;
-        })
-        (callHackage {
-          name = "hlint";
-          version = "3.10";
-          haskellPackages = pkgs.haskell.packages.ghc912;
-        })
-        haskellPackages.apply-refact
-        haskellPackages.ghc-tags
-        haskellPackages.cabal-gild
+          pkgs.gnumake
+          pkgs.pkg-config
+        ]
+        ++ libs;
 
-        pkgs.gnumake
-        pkgs.pkg-config
-      ]
-      ++ libs;
-
-    LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
-  })
+      LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
+    })
diff --git a/npins/sources.json b/npins/sources.json
index 16dd5d7f..d9a87783 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -270,11 +270,11 @@
         "owner": "NixOS",
         "repo": "nixpkgs"
       },
-      "branch": "nixos-25.05",
+      "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
-      "url": "https://github.com/NixOS/nixpkgs/archive/fc756aa6f5d3e2e5666efcf865d190701fef150a.tar.gz",
-      "hash": "09s5npwi2vdi0ldkjbavfjb9lwg3x9wwrndnmbh72rbal6zjm23s",
+      "revision": "641d909c4a7538f1539da9240dedb1755c907e40",
+      "url": "https://github.com/NixOS/nixpkgs/archive/641d909c4a7538f1539da9240dedb1755c907e40.tar.gz",
+      "hash": "10hpb1aw884k3zzcy1mhf47dqvfagiyx7kr6hg0p5xcwg04mkx8x",
       "frozen": true
     },
     "pin-necro-man-nixpkgs": {