I agree, I'd expect file-storage to inherit from its respective subsite.
You can do it straight n psql/sqlplus, right? "update acs_objects set context_id = ... where object_id = ...". But wait, that breaks the "cache" table. But maybe there's a way to flush that. Don't know.