diff --git a/hosts/common/programs/bonsai.nix b/hosts/common/programs/bonsai.nix
index e23ff0d1c..b3c7e0de2 100644
--- a/hosts/common/programs/bonsai.nix
+++ b/hosts/common/programs/bonsai.nix
@@ -25,7 +25,7 @@ in
       '';
     });
 
-    # fs.".config/bonsai/bonsai_tree.json".symlink.target = config.services.bonsaid.settingsFile;
+    fs.".config/bonsai/bonsai_tree.json".symlink.target = config.services.bonsaid.settingsFile;
 
     sandbox.extraRuntimePaths = [
       "bonsai"
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 5e0277441..df4dac279 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./bonsaid.nix
+    # ./bonsaid.nix  #< UPSTREAMING IN PROGRESS: <https://github.com/NixOS/nixpkgs/pull/347818>
     ./buffyboard.nix
     ./dropbear.nix
     ./clightning.nix
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 0d9725723..cea5960db 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -39,6 +39,13 @@ in
   #   hash = "sha256-4nzTHWmAiY9HMTu07rj0RdhlK7SWshXpkoqlKHg25do=";
   # })
 
+  (fetchpatch' {
+    name = "nixos/bonsaid: init";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";
+    # saneCommit = "bc3d311bdc11a26b8b0a95806c0ea7b80554548d";
+    hash = "sha256-xCZIz7vmA/Fq0/G3tyapkdU2qIVtfueArN1qvbZ0y3w=";
+  })
+
   (fetchpatch' {
     name = "nixos/pam: replace apparmor warnings with assertions";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/332119";