diff --git a/home-manager/sajenim/features/cli/default.nix b/home-manager/sajenim/features/cli/default.nix
index acb161c..32c157e 100644
--- a/home-manager/sajenim/features/cli/default.nix
+++ b/home-manager/sajenim/features/cli/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./irc.nix
     ./mpd.nix
+    ./remarkable.nix
   ];
 }
diff --git a/home-manager/sajenim/features/university/remarkable.nix b/home-manager/sajenim/features/cli/remarkable.nix
similarity index 100%
rename from home-manager/sajenim/features/university/remarkable.nix
rename to home-manager/sajenim/features/cli/remarkable.nix
diff --git a/home-manager/sajenim/features/cli/ssh.nix b/home-manager/sajenim/features/cli/ssh.nix
index acb6ee1..de91753 100644
--- a/home-manager/sajenim/features/cli/ssh.nix
+++ b/home-manager/sajenim/features/cli/ssh.nix
@@ -25,6 +25,12 @@
         user = "forgejo";
         identityFile = "/home/sajenim/.ssh/jasmine-forgejo_sk";
       };
+
+      "turing" = {
+        hostname = "turing.une.edu.au";
+        user = "jwils254";
+        identityFile = "/home/sajenim/.ssh/jwils254_sk";
+      };
     };
   };
 }
diff --git a/home-manager/sajenim/features/university/default.nix b/home-manager/sajenim/features/university/default.nix
index 4512c7c..81d6a59 100644
--- a/home-manager/sajenim/features/university/default.nix
+++ b/home-manager/sajenim/features/university/default.nix
@@ -1,24 +1,9 @@
 {pkgs, ...}: {
-  imports = [
-    ./remarkable.nix
-  ];
-
   home.packages = with pkgs; [
-    logisim # required for outdated projects
+    logisim
     libreoffice
     obsidian
     x2goclient
     zoom-us
   ];
-
-  # Enable the use of the yubikey for ssh authentication
-  programs.ssh = {
-    matchBlocks = {
-      "turing" = {
-        hostname = "turing.une.edu.au";
-        user = "jwils254";
-        identityFile = "/home/sajenim/.ssh/jwils254_sk";
-      };
-    };
-  };
 }