diff --git a/lib/FilesHooks.php b/lib/FilesHooks.php
index 10958a78a..c21cc79ba 100644
--- a/lib/FilesHooks.php
+++ b/lib/FilesHooks.php
@@ -15,6 +15,7 @@
 use OCA\Circles\CirclesManager;
 use OCA\Circles\Model\Member;
 use OCP\Activity\IManager;
+use OCP\BackgroundJob\IJobList;
 use OCP\Constants;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\IRootFolder;
@@ -206,7 +207,7 @@ protected function generateRemoteActivity(array $remoteUsers, string $type, int
 				$arguments[] = $info['second_path'];
 			}
 
-			\OC::$server->getJobList()->add(RemoteActivity::class, $arguments);
+			\OCP\Server::get(IJobList::class)->add(RemoteActivity::class, $arguments);
 		}
 	}
 
@@ -1275,8 +1276,8 @@ private function getUnrelatedUsers(int $fileId, array $cachedMounts): array {
 		/** @var \OCA\GroupFolders\ACL\RuleManager $ruleManager */
 		/** @var \OCA\GroupFolders\Folder\FolderManager $folderManager */
 		try {
-			$ruleManager = \OC::$server->get(\OCA\GroupFolders\ACL\RuleManager::class);
-			$folderManager = \OC::$server->get(\OCA\GroupFolders\Folder\FolderManager::class);
+			$ruleManager = \OCP\Server::get(\OCA\GroupFolders\ACL\RuleManager::class);
+			$folderManager = \OCP\Server::get(\OCA\GroupFolders\Folder\FolderManager::class);
 		} catch (\Throwable $e) {
 			return []; // if we have no access to RuleManager, we cannot filter unrelated users
 		}
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index adc7e0b33..e8a15f7e7 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="lib/BackgroundJob/RemoteActivity.php">
     <UndefinedClass>
       <code><![CDATA[ClientException]]></code>
@@ -22,15 +22,29 @@
   </file>
   <file src="lib/FilesHooks.php">
     <UndefinedClass>
+      <code><![CDATA[$mountPoint]]></code>
+      <code><![CDATA[$mountPoint]]></code>
+      <code><![CDATA[$mountPoint]]></code>
       <code><![CDATA[$this->teamManager]]></code>
       <code><![CDATA[$this->teamManager]]></code>
       <code><![CDATA[Member]]></code>
+      <code><![CDATA[\OCA\GroupFolders\ACL\RuleManager]]></code>
+      <code><![CDATA[\OCA\GroupFolders\Folder\FolderManager]]></code>
+      <code><![CDATA[\OCA\GroupFolders\Mount\GroupMountPoint]]></code>
       <code><![CDATA[protected]]></code>
     </UndefinedClass>
     <UndefinedDocblockClass>
+      <code><![CDATA[$rule]]></code>
+      <code><![CDATA[$rule]]></code>
+      <code><![CDATA[$rule]]></code>
+      <code><![CDATA[$rules]]></code>
       <code><![CDATA[$shareOwner]]></code>
       <code><![CDATA[$storage]]></code>
     </UndefinedDocblockClass>
+    <UndefinedInterfaceMethod>
+      <code><![CDATA[getFolderId]]></code>
+      <code><![CDATA[getSourcePath]]></code>
+    </UndefinedInterfaceMethod>
   </file>
   <file src="lib/Migration/Version2008Date20181011095117.php">
     <UndefinedClass>