diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig
index 2fe759dc03..5a262de836 100644
--- a/src/codegen/spirv.zig
+++ b/src/codegen/spirv.zig
@@ -1,4 +1,6 @@
 const std = @import("std");
+const Allocator = std.mem.Allocator;
+
 const spec = @import("spirv/spec.zig");
 const Module = @import("../Module.zig");
 const Decl = Module.Decl;
@@ -10,14 +12,35 @@ pub fn writeInstruction(code: *std.ArrayList(u32), instr: spec.Opcode, args: []c
 }
 
 pub const SPIRVModule = struct {
-    // TODO: Also use a free list.
     next_id: u32 = 0,
+    free_id_list: std.ArrayList(u32),
+
+    pub fn init(allocator: *Allocator) SPIRVModule {
+        return .{
+            .free_id_list = std.ArrayList(u32).init(allocator),
+        };
+    }
+
+    pub fn deinit(self: *SPIRVModule) void {
+        self.free_id_list.deinit();
+    }
 
     pub fn allocId(self: *SPIRVModule) u32 {
+        if (self.free_id_list.popOrNull()) |id| return id;
+
         defer self.next_id += 1;
         return self.next_id;
     }
 
+    pub fn freeId(self: *SPIRVModule, id: u32) void {
+        if (id + 1 == self.next_id) {
+            self.next_id -= 1;
+        } else {
+            // If no more memory to append the id to the free list, just ignore it.
+            self.free_id_list.append(id) catch {};
+        }
+    }
+
     pub fn idBound(self: *SPIRVModule) u32 {
         return self.next_id;
     }
diff --git a/src/link/SpirV.zig b/src/link/SpirV.zig
index 80469726e0..bde1eae391 100644
--- a/src/link/SpirV.zig
+++ b/src/link/SpirV.zig
@@ -38,7 +38,7 @@ pub const FnData = struct {
 base: link.File,
 
 // TODO: Does this file need to support multiple independent modules?
-spirv_module: codegen.SPIRVModule = .{},
+spirv_module: codegen.SPIRVModule,
 
 pub fn createEmpty(gpa: *Allocator, options: link.Options) !*SpirV {
     const spirv = try gpa.create(SpirV);
@@ -49,6 +49,7 @@ pub fn createEmpty(gpa: *Allocator, options: link.Options) !*SpirV {
             .file = null,
             .allocator = gpa,
         },
+        .spirv_module = codegen.SPIRVModule.init(gpa),
     };
 
     // TODO: Figure out where to put all of these
@@ -87,6 +88,7 @@ pub fn openPath(allocator: *Allocator, sub_path: []const u8, options: link.Optio
 }
 
 pub fn deinit(self: *SpirV) void {
+    self.spirv_module.deinit();
 }
 
 pub fn updateDecl(self: *SpirV, module: *Module, decl: *Module.Decl) !void {
@@ -116,9 +118,12 @@ pub fn updateDeclExports(
 ) !void {}
 
 pub fn freeDecl(self: *SpirV, decl: *Module.Decl) void {
-    decl.fn_link.spirv.code.deinit(self.base.allocator);
+    var fn_data = decl.fn_link.spirv;
+    fn_data.code.deinit(self.base.allocator);
+    if (fn_data.id) |id| self.spirv_module.freeId(id);
     decl.fn_link.spirv = undefined;
 }
+
 pub fn flush(self: *SpirV, comp: *Compilation) !void {
     if (build_options.have_llvm and self.base.options.use_lld) {
         return error.LLD_LinkingIsTODO_ForSpirV; // TODO: LLD Doesn't support SpirV at all.
@@ -137,8 +142,8 @@ pub fn flushModule(self: *SpirV, comp: *Compilation) !void {
     var binary = std.ArrayList(u32).init(self.base.allocator);
     defer binary.deinit();
 
-    // Note: The order of adding functions to the final binary
-    // follows the SPIR-V logical moduel format!
+    // Note: The order of adding sections to the final binary
+    // follows the SPIR-V logical module format!
 
     try binary.appendSlice(&[_]u32{
         spec.magic_number,