diff --git a/modules/module-client-permissions.c b/modules/module-client-permissions.c
index e963259d..bc321336 100644
--- a/modules/module-client-permissions.c
+++ b/modules/module-client-permissions.c
@@ -9,36 +9,74 @@
 #include <wp/wp.h>
 #include <pipewire/pipewire.h>
 
-static void
-client_added (WpObjectManager * om, WpClient *client, gpointer data)
+struct _WpClientPermissions
+{
+  WpPlugin parent;
+  WpObjectManager *om;
+};
+
+G_DECLARE_FINAL_TYPE (WpClientPermissions, wp_client_permissions,
+                      WP, CLIENT_PERMISSIONS, WpPlugin)
+G_DEFINE_TYPE (WpClientPermissions, wp_client_permissions, WP_TYPE_PLUGIN)
+
+static void
+wp_client_permissions_init (WpClientPermissions * self)
+{
+}
+
+static void
+client_added (WpObjectManager * om, WpClient *client, WpClientPermissions * self)
 {
-  g_autoptr (WpProperties) properties = NULL;
-  const char *access;
   guint32 id = wp_proxy_get_bound_id (WP_PROXY (client));
+  const char *access = wp_proxy_get_property (WP_PROXY (client), PW_KEY_ACCESS);
 
-  g_debug ("Client added: %d", id);
-
-  properties = wp_proxy_get_properties (WP_PROXY (client));
-  access = wp_properties_get (properties, PW_KEY_ACCESS);
+  wp_debug_object (self, "Client added: %d, access: %s", id, access);
 
   if (!g_strcmp0 (access, "flatpak") || !g_strcmp0 (access, "restricted")) {
-    g_debug ("Granting full access to client %d", id);
+    wp_debug_object (self, "Granting full access to client %d", id);
     wp_client_update_permissions (client, 1, -1, PW_PERM_RWX);
   }
 }
 
+static void
+wp_client_permissions_activate (WpPlugin * plugin)
+{
+  WpClientPermissions * self = WP_CLIENT_PERMISSIONS (plugin);
+  g_autoptr (WpCore) core = wp_plugin_get_core (plugin);
+
+  g_return_if_fail (core);
+
+  self->om = wp_object_manager_new ();
+  wp_object_manager_add_interest (self->om, WP_TYPE_CLIENT, NULL);
+  wp_object_manager_request_proxy_features (self->om, WP_TYPE_CLIENT,
+      WP_PROXY_FEATURES_STANDARD);
+
+  g_signal_connect (self->om, "object-added", (GCallback) client_added, self);
+
+  wp_core_install_object_manager (core, self->om);
+}
+
+static void
+wp_client_permissions_deactivate (WpPlugin * plugin)
+{
+  WpClientPermissions * self = WP_CLIENT_PERMISSIONS (plugin);
+
+  g_clear_object (&self->om);
+}
+
+static void
+wp_client_permissions_class_init (WpClientPermissionsClass * klass)
+{
+  WpPluginClass *plugin_class = (WpPluginClass *) klass;
+
+  plugin_class->activate = wp_client_permissions_activate;
+  plugin_class->deactivate = wp_client_permissions_deactivate;
+}
+
 WP_PLUGIN_EXPORT void
 wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
 {
-  WpObjectManager *om;
-
-  om = wp_object_manager_new ();
-  wp_object_manager_add_interest (om, WP_TYPE_CLIENT, NULL);
-  wp_object_manager_request_proxy_features (om, WP_TYPE_CLIENT,
-      WP_PROXY_FEATURES_STANDARD);
-
-  g_signal_connect (om, "object-added", (GCallback) client_added, NULL);
-
-  wp_core_install_object_manager (core, om);
-  wp_module_set_destroy_callback (module, g_object_unref, om);
+  wp_plugin_register (g_object_new (wp_client_permissions_get_type (),
+          "module", module,
+          NULL));
 }