diff --git a/src/extension.vala b/src/extension.vala
index 216ba25..14f9d32 100644
--- a/src/extension.vala
+++ b/src/extension.vala
@@ -45,12 +45,8 @@ namespace MediaPlayer {
     // TODO: Remove our CSS here
   }
 
-  [CCode (cname = "g_io_phosh_plugin_media_player_query")]
+  [CCode (cname = "g_io_phosh_plugin_media_player_query", array_null_terminated = true, array_length = false)]
   public static string[] query () {
-    StrvBuilder builder = new StrvBuilder ();
-
-    builder.add ("phosh-quick-setting-widget");
-    builder.add ("phosh-lockscreen-widget");
-    return builder.end ();
+    return { "phosh-quick-setting-widget", "phosh-lockscreen-widget" };
   }
 }
diff --git a/src/prefs/extension.vala b/src/prefs/extension.vala
index 6ea61c3..924dd48 100644
--- a/src/prefs/extension.vala
+++ b/src/prefs/extension.vala
@@ -39,12 +39,8 @@ namespace MediaPlayer.Preferences {
   public static void unload (IOModule module) {
   }
 
-  [CCode (cname = "g_io_phosh_plugin_prefs_media_player_query")]
+  [CCode (cname = "g_io_phosh_plugin_prefs_media_player_query", array_null_terminated = true, array_length = false)]
   public static string[] query () {
-    StrvBuilder builder = new StrvBuilder ();
-
-    builder.add ("phosh-quick-setting-widget-prefs");
-    builder.add ("phosh-lockscreen-widget-prefs");
-    return builder.end ();
+    return { "phosh-quick-setting-widget-prefs", "phosh-lockscreen-widget-prefs" };
   }
 }