diff --git a/y2023/control_loops/superstructure/BUILD b/y2023/control_loops/superstructure/BUILD
index 3d35dae..f62d790 100644
--- a/y2023/control_loops/superstructure/BUILD
+++ b/y2023/control_loops/superstructure/BUILD
@@ -1,35 +1,32 @@
+load("//aos/flatbuffers:generate.bzl", "static_flatbuffer")
 load("//tools/build_rules:js.bzl", "ts_project")
-load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library")
 load("@com_github_google_flatbuffers//:typescript.bzl", "flatbuffer_ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
-flatbuffer_cc_library(
+static_flatbuffer(
     name = "superstructure_goal_fbs",
     srcs = [
         "superstructure_goal.fbs",
     ],
-    gen_reflections = 1,
     deps = [
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops:profiled_subsystem_fbs",
     ],
 )
 
-flatbuffer_cc_library(
+static_flatbuffer(
     name = "superstructure_output_fbs",
     srcs = [
         "superstructure_output.fbs",
     ],
-    gen_reflections = 1,
 )
 
-flatbuffer_cc_library(
+static_flatbuffer(
     name = "superstructure_status_fbs",
     srcs = [
         "superstructure_status.fbs",
     ],
-    gen_reflections = 1,
     deps = [
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops:profiled_subsystem_fbs",
@@ -49,12 +46,11 @@
     ],
 )
 
-flatbuffer_cc_library(
+static_flatbuffer(
     name = "superstructure_position_fbs",
     srcs = [
         "superstructure_position.fbs",
     ],
-    gen_reflections = 1,
     deps = [
         "//frc971/control_loops:control_loops_fbs",
         "//frc971/control_loops:profiled_subsystem_fbs",
diff --git a/y2023/control_loops/superstructure/arm/BUILD b/y2023/control_loops/superstructure/arm/BUILD
index 768a54e..2f4e7d6 100644
--- a/y2023/control_loops/superstructure/arm/BUILD
+++ b/y2023/control_loops/superstructure/arm/BUILD
@@ -1,4 +1,4 @@
-load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library")
+load("//aos/flatbuffers:generate.bzl", "static_flatbuffer")
 
 cc_library(
     name = "arm",
@@ -73,12 +73,11 @@
     ],
 )
 
-flatbuffer_cc_library(
+static_flatbuffer(
     name = "arm_trajectories_fbs",
     srcs = [
         "arm_trajectories.fbs",
     ],
-    gen_reflections = 1,
     visibility = ["//visibility:public"],
 )