diff --git a/extensions/nicknames/extend.php b/extensions/nicknames/extend.php
index 663885401..d6f323b8c 100644
--- a/extensions/nicknames/extend.php
+++ b/extensions/nicknames/extend.php
@@ -11,12 +11,10 @@
 
 namespace Flarum\Nicknames;
 
-use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Api\Serializer\UserSerializer;
-use Flarum\Event\ConfigureUserGambits;
 use Flarum\Extend;
-use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Event\Saving;
+use Flarum\User\Search\UserSearcher;
 use Flarum\User\UserValidator;
 
 return [
@@ -32,8 +30,7 @@ return [
         ->displayNameDriver('nickname', NicknameDriver::class),
 
     (new Extend\Event())
-        ->listen(Saving::class, SaveNicknameToDatabase::class)
-        ->listen(ConfigureUserGambits::class, SetUserNicknameGambit::class),
+        ->listen(Saving::class, SaveNicknameToDatabase::class),
 
     (new Extend\ApiSerializer(UserSerializer::class))
         ->attribute('canEditOwnNickname', function ($serializer, $user) {
@@ -47,4 +44,6 @@ return [
     (new Extend\Validator(UserValidator::class))
         ->configure(AddNicknameValidation::class),
 
+    (new Extend\SimpleFlarumSearch(UserSearcher::class))
+        ->setFullTextGambit(NicknameFullTextGambit::class)
 ];
diff --git a/extensions/nicknames/src/SetUserNicknameGambit.php b/extensions/nicknames/src/SetUserNicknameGambit.php
deleted file mode 100644
index bc8f008d1..000000000
--- a/extensions/nicknames/src/SetUserNicknameGambit.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-
-namespace Flarum\Nicknames;
-
-use Flarum\Event\ConfigureUserGambits;
-
-class SetUserNicknameGambit
-{
-    public function handle(ConfigureUserGambits $event) {
-        $event->gambits->setFulltextGambit(NicknameFullTextGambit::class);
-    }
-}