Given how the question was asked of Lars, the 2,500 may still be a limit.
Many of the Cybercabs are self-certified because they HAVE or can easily be converted to having steering wheel & pedals. It takes a few hours but Tesla has kits for this.
The same cars they display with no steering wheel are convertible. So yes they would self-certify those.
I don’t think we have the definitive answer…?