diff --git a/home/common-linux.nix b/home/common-linux.nix
index 536476b..4a2fa39 100644
--- a/home/common-linux.nix
+++ b/home/common-linux.nix
@@ -12,6 +12,10 @@ with lib; {
       file # Query file type
 
       pinentry-gnome
+
+      # Java stuff
+      jdk21
+      sbt
     ] ++ (
       if pkgs.stdenv.isx86_64
       then [
diff --git a/home/kagami-pc-home.nix b/home/kagami-pc-home.nix
index b1613e6..0eb1ed7 100644
--- a/home/kagami-pc-home.nix
+++ b/home/kagami-pc-home.nix
@@ -21,10 +21,6 @@
     texlive.combined.scheme-full
     inkscape # for TeX svg
 
-    # Java & sbt
-    jdk21
-    sbt
-
     # Gaming stuff
     wineWowPackages.full
     # wine-lol
diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index d7f4374..f52a251 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -42,10 +42,6 @@ in
     discord
 
     typora
-
-    # Java & sbt
-    openjdk11
-    sbt
   ]);
 
   # Graphical set up
diff --git a/home/nki-framework.nix b/home/nki-framework.nix
index 1bacb35..097a175 100644
--- a/home/nki-framework.nix
+++ b/home/nki-framework.nix
@@ -24,9 +24,6 @@
     texlive.combined.scheme-full
     # Note-taking
     rnote
-
-    # Java & sbt
-    jdk19
   ]);
 
   # Graphical set up
diff --git a/home/nki-x1c1.nix b/home/nki-x1c1.nix
index b8b33f2..49f0ed0 100644
--- a/home/nki-x1c1.nix
+++ b/home/nki-x1c1.nix
@@ -24,9 +24,6 @@
     texlive.combined.scheme-full
     # Note-taking
     rnote
-
-    # Java & sbt
-    jdk19
   ]);
 
   # Graphical set up