diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix
index 305c52a..a29256e 100644
--- a/hosts/yodaGaming/configuration.nix
+++ b/hosts/yodaGaming/configuration.nix
@@ -29,6 +29,7 @@
       ../../modules/blackbox.nix
 
       ../../modules/programs.nix
+      ../../modules/flatpak.nix
       ../../modules/signal-desktop.nix
       #../../modules/games.nix
 
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 28bdbfa..b77a57d 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -31,6 +31,7 @@
       ../../modules/blackbox.nix
 
       ../../modules/programs.nix
+      ../../modules/flatpak.nix
       ../../modules/nextcloud-client.nix
       ../../modules/syncthing.nix
       ../../modules/signal-desktop.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index d3beae6..47a1e25 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -33,7 +33,7 @@
       ../../modules/blackbox.nix
 
       ../../modules/programs.nix
-      #../../modules/spaceFM.nix
+      ../../modules/flatpak.nix
       ../../modules/ausweisapp.nix
       ../../modules/nextcloud-client.nix
       ../../modules/syncthing.nix
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
new file mode 100644
index 0000000..ebffe75
--- /dev/null
+++ b/modules/flatpak.nix
@@ -0,0 +1,32 @@
+{
+  # Declarative Flatpak app installations:
+  # - https://github.com/GermanBread/declarative-flatpak
+  # This is probably a bit overkill for the few Flatpak apps I use.
+  #
+  # Another community project for declarative Flatpak app installations:
+  # - https://github.com/gmodena/nix-flatpak#packages
+  # > You could try to clone the repo to a location relative to your configuration.nix, and import modules/nixos.nix directly. However, I suspect things will break.
+  # > I’ll sandbox some time to try this out the upcoming weekend.
+  # > https://discourse.nixos.org/t/managing-flatpaks-declaratively/34532/3
+  #F
+  # Let's just use the default way:
+  #   https://nixos.wiki/wiki/Flatpak
+  services.flatpak.enable = true;
+  #
+  # TODO: These commands have to be executed manually.
+  #   flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+  #   flatpak update
+  #
+  #   # Change PDF metadata
+  #   flatpak install io.github.diegoivan.pdf_metadata_editor
+  #   # Trim, flip, rotate, crop and export individual clips.
+  #   flatpak install io.gitlab.adhami3310.Footage
+  #   # Fediverse client. There is also a native client, but it is outdated: https://github.com/GeopJr/Tuba#third-party
+  #   flatpak install dev.geopjr.Tuba
+  #   # Chat with AI.
+  #   # nixpkgs merge request: https://github.com/NixOS/nixpkgs/pull/228585
+  #   # AUR and flatpak builder: https://bavarder.codeberg.page/install/
+  #   flatpak install io.github.Bavarder.Bavarder
+  #   # Speedtest in Germany. Also available in nixpkgs stable/unstable, but outdated.
+  #   flatpak install de.breitbandmessung.Breitbandmessung
+}
\ No newline at end of file
diff --git a/modules/programs.nix b/modules/programs.nix
index b736275..8fa8aa1 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -80,35 +80,4 @@
       warp # Fast and secure file transfer
     ];
   };
-
-  # Declarative Flatpak app installations:
-  # - https://github.com/GermanBread/declarative-flatpak
-  # This is probably a bit overkill for the few Flatpak apps I use.
-  #
-  # Another community project for declarative Flatpak app installations:
-  # - https://github.com/gmodena/nix-flatpak#packages
-  # > You could try to clone the repo to a location relative to your configuration.nix, and import modules/nixos.nix directly. However, I suspect things will break.
-  # > I’ll sandbox some time to try this out the upcoming weekend.
-  # > https://discourse.nixos.org/t/managing-flatpaks-declaratively/34532/3
-  #
-  # Let's just use the default way:
-  #   https://nixos.wiki/wiki/Flatpak
-  services.flatpak.enable = true;
-  #
-  # TODO: These commands have to be executed manually.
-  #   flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  #   flatpak update
-  #
-  #   # Change PDF metadata
-  #   flatpak install io.github.diegoivan.pdf_metadata_editor
-  #   # Trim, flip, rotate, crop and export individual clips.
-  #   flatpak install io.gitlab.adhami3310.Footage
-  #   # Fediverse client. There is also a native client, but it is outdated: https://github.com/GeopJr/Tuba#third-party
-  #   flatpak install dev.geopjr.Tuba
-  #   # Chat with AI.
-  #   # nixpkgs merge request: https://github.com/NixOS/nixpkgs/pull/228585
-  #   # AUR and flatpak builder: https://bavarder.codeberg.page/install/
-  #   flatpak install io.github.Bavarder.Bavarder
-  #   # Speedtest in Germany. Also available in nixpkgs stable/unstable, but outdated.
-  #   flatpak install de.breitbandmessung.Breitbandmessung
 }