diff --git a/flake.lock b/flake.lock
index ce77404..5118795 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,6 +21,21 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1776625032,
+        "narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1776734388,
@@ -39,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1776329215,
-        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
+        "lastModified": 1776949667,
+        "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
+        "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
         "type": "github"
       },
       "original": {
@@ -56,6 +71,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index aa24ed2..57dccd1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,11 @@
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-flatpak = {
+      url = "github:gmodena/nix-flatpak";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   # This strange syntax is a workaround for the intentional limitations of `flake.nix` files.
diff --git a/outputs.nix b/outputs.nix
index f01dd5c..2258de4 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, nixpkgs-unstable, home-manager, ... }:
+{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
 
 let
   mkPkgsUnstable = system: import nixpkgs-unstable {
@@ -13,8 +13,10 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
       };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/gandalf
       ];
@@ -23,8 +25,10 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
       };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/frodo
       ];
@@ -33,8 +37,10 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
       };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/legolas
       ];
@@ -43,8 +49,10 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
+        nixFlatpak = nix-flatpak;
       };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/work
       ];
diff --git a/systems/gandalf/default.nix b/systems/gandalf/default.nix
index f9f0b3d..9bf736b 100644
--- a/systems/gandalf/default.nix
+++ b/systems/gandalf/default.nix
@@ -23,7 +23,7 @@
       ../modules/qbittorrent.nix
       ../modules/gimp.nix
       ../modules/openscad.nix
-      ../modules/flatpak.nix
+      ../modules/bambu-studio-flatpak.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
diff --git a/systems/modules/bambu-studio-flatpak.nix b/systems/modules/bambu-studio-flatpak.nix
new file mode 100644
index 0000000..01a5085
--- /dev/null
+++ b/systems/modules/bambu-studio-flatpak.nix
@@ -0,0 +1,8 @@
+{ pkgs, ...}:
+
+{
+  services.flatpak.enable = true;
+  services.flatpak.packages = [
+    "com.bambulab.BambuStudio"
+  ];
+}
\ No newline at end of file
diff --git a/systems/modules/bambu-studio.nix b/systems/modules/bambu-studio.nix
deleted file mode 100644
index ababe27..0000000
--- a/systems/modules/bambu-studio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... } :
-
-{
-  environment.systemPackages = with pkgs; [
-    bambu-studio
-  ];
-}
diff --git a/systems/modules/flatpak.nix b/systems/modules/flatpak.nix
deleted file mode 100644
index dead9b4..0000000
--- a/systems/modules/flatpak.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ...}: 
-
-{
-  services.flatpak.enable = true;
-}
diff --git a/systems/modules/home/programs/git.nix b/systems/modules/home/programs/git.nix
index 6c0e130..c00a61b 100644
--- a/systems/modules/home/programs/git.nix
+++ b/systems/modules/home/programs/git.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }:
+{ lib, pkgsUnstable, config, ... }:
 
 {
   options.home.git = {
@@ -18,6 +18,7 @@
   config = {
     programs.git = {
       enable = true;
+      package = pkgsUnstable.git;
       settings.user = {
         name = config.home.git.userName;
         email = config.home.git.userEmail;