@Jay ********
, which immigration office you have to go depends on what kind of stamp you have (latest entry or extension pre-covid, unless you applied for new non-immigrant type visa/extension)
If you are asking just which office issues Covid extension, the answer is 'both'.