Equity investors generally get restricted shares, and they DO show up in the OS, common or not. All shares not in the treasury show up in the OS. The float is the OS minus the insider and equity investor shares, essentially. That is, the tradable shares.
The "tradeable float" is pretty close to the OS. The current restricted shares are only 200 million or so...and we know the insiders have very few common shares. Also the "Held at DTC" is probably the best indication of the float...and it is pretty close to the OS minus restricted at about 6.5 Billion