OIS in every lens.
I for one wouldn't want this to ever happen. I'm no optical engineer but AFAIK there are lots of optical designs which can't accommodate OIS, and would have to be changed and the lens' performance compromised to do so. Of course, some designs allow for OIS just fine, and in those cases, great! But I'd rather have every lens be the best it can be, optically, and figure out stabilization externally if necessary.
Not to mention that paying for IBIS once is cheaper than paying for OIS over and over again, and IBIS+non-OIS lens is smaller and lighter than normal sensor+OIS lens. And of course IBIS can be turned off if you're some sort of purist about it, but with OIS+IBIS working so well together (when properly engineered), I don't see why you'd want to.