diff --git a/common/configuration.nix b/common/configuration.nix
index ed4550e..2f87d1e 100644
--- a/common/configuration.nix
+++ b/common/configuration.nix
@@ -38,21 +38,6 @@
   services.udisks2.enable = true;
   services.libinput.enable = true;
 
-  services.flatpak = {
-    enable = true;
-    packages = [ "dev.aunetx.deezer" "im.riot.Riot" ];
-    update.onActivation = true;
-    overrides = {
-      global = {
-        Context.sockets = [ "wayland" "!x11" "!fallback-x11" ];
-        Environment = {
-          XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons";
-          GTK_THEME = "Adwaita:dark";
-        };
-      };
-    };
-  };
-
   programs.hyprland.enable = true;
   programs.zsh.enable = true;
 
diff --git a/flake.lock b/flake.lock
index 9e249c8..4600595 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,21 +21,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1721549352,
-        "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1727348695,
@@ -55,7 +40,6 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index d7bfa8a..3829ba9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,12 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-flatpak.url = "github:gmodena/nix-flatpak";
   };
 
-  outputs = { self, nixpkgs, home-manager, nix-flatpak, ... }: {
+  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
     nixosConfigurations.ahrc-pc = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         ./ahrc-pc/configuration.nix
         home-manager.nixosModules.home-manager
         {
@@ -26,7 +24,6 @@
     nixosConfigurations.ahrc-laptop = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         ./ahrc-laptop/configuration.nix
         home-manager.nixosModules.home-manager
         {